Skip to content

Commit 3952539

Browse files
committed
Finish 1.7.0
2 parents 609aca8 + 3e1b5e0 commit 3952539

File tree

229 files changed

+5604
-1939
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

229 files changed

+5604
-1939
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# jMonkeyBuilder 1.6.1 #
1+
# jMonkeyBuilder 1.7.0 #
22
### It's 3D Editor to prepare/work/create graphics content for jMonkeyEngine 3.2 ###
33

44
[![Join the chat at https://gitter.im/jME3-SpaceShift-Editor/Lobby](https://badges.gitter.im/jME3-SpaceShift-Editor/Lobby.svg)](https://gitter.im/jME3-SpaceShift-Editor/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

app.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.6.1
1+
1.7.0

build-native.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@
180180

181181
<fx:platform>
182182
<fx:jvmarg value="-XX:+UseParallelGC"/>
183-
<!--<fx:jvmarg value="-agentlib:jdwp=transport=dt_socket,server=n,address=javasabr-NB:6005,suspend=y"/>-->
183+
<!--<fx:jvmarg value="-agentlib:jdwp=transport=dt_socket,server=n,address=localhost:6005,suspend=y"/>-->
184184
</fx:platform>
185185

186186
<preferences shortcut="true" menu="true" install="false"/>

build.gradle

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ apply plugin: 'idea'
1313
apply plugin: 'org.junit.platform.gradle.plugin'
1414

1515
group = 'com.spaceshift'
16-
version = '1.6.1'
16+
version = '1.7.0'
1717

1818
sourceCompatibility = 1.8
1919
targetCompatibility = 1.8
@@ -28,7 +28,7 @@ ext.applicationMainClass = "com.ss.editor.JfxApplication"
2828
ext.applicationVendor = "[email protected]"
2929
ext.applicationTitle = "jMonkeyBuilder"
3030
ext.jmeVersion = "v3.3.dev-SNAPSHOT"
31-
ext.jmbExtVersion = "1.9.8"
31+
ext.jmbExtVersion = "2.1.1"
3232
ext.jme3_xbuf_version = '0.9.1'
3333
ext.junitPlatformVersion = "1.0.0"
3434
ext.junitJupiterVersion = "5.0.0"
@@ -61,8 +61,10 @@ dependencies {
6161
compile 'org.controlsfx:controlsfx:8.40.14'
6262

6363
compile 'com.github.JavaSaBr:RlibFX:4.1.3'
64-
compile 'com.github.JavaSaBr:RLib:6.7.4'
65-
compile "com.github.JavaSaBr:JME3-JFX:1.7.3"
64+
compile 'com.github.JavaSaBr:RLib:6.7.7'
65+
compile ("com.github.JavaSaBr:JME3-JFX:1.7.4") {
66+
exclude group: 'org.jmonkeyengine'
67+
}
6668

6769
// https://mvnrepository.com/artifact/org.apache.commons/commons-lang3
6870
compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.6'
@@ -88,7 +90,6 @@ dependencies {
8890
compile "com.github.JavaSaBr.jmonkeyengine:jme3-desktop:$jmeVersion"
8991
compile "com.github.JavaSaBr.jmonkeyengine:jme3-terrain:$jmeVersion"
9092
compile "com.github.JavaSaBr.jmonkeyengine:jme3-plugins:$jmeVersion"
91-
compile "com.github.JavaSaBr.jmonkeyengine:jme3-effects:$jmeVersion"
9293
compile "com.github.JavaSaBr.jmonkeyengine:jme3-blender:$jmeVersion"
9394
compile "com.github.JavaSaBr.jmonkeyengine:jme3-jogg:$jmeVersion"
9495
compile ("com.github.JavaSaBr.jmonkeyengine:jme3-testdata:$jmeVersion") {
@@ -163,7 +164,7 @@ task javadocJar(type: Jar, dependsOn: javadoc) {
163164
}
164165

165166
task wrapper(type: Wrapper) {
166-
gradleVersion = '4.4'
167+
gradleVersion = '4.5.1'
167168
}
168169

169170
artifacts {

gradle/wrapper/gradle-wrapper.jar

4 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)