diff --git a/build.gradle b/build.gradle index c9aaea2..6f7778e 100755 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ // Based on https://github.com/OnyxStudios/Cardinal-Components-API/blob/1.17/build.gradle plugins { - id "fabric-loom" version "0.10-SNAPSHOT" apply false + id "fabric-loom" version "0.12-SNAPSHOT" apply false id "com.matthewprenger.cursegradle" version "1.4.0" id "maven-publish" id "java-library" diff --git a/gradle.properties b/gradle.properties index 570f9be..cd9ab16 100755 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ org.gradle.jvmargs=-Xmx1G loader_version=0.13.3 # Mod Properties - mod_version = 1.2.1 + mod_version = 1.2.2 maven_group = net.puzzlemc archives_base_name = puzzle diff --git a/puzzle-gui/src/main/resources/fabric.mod.json b/puzzle-gui/src/main/resources/fabric.mod.json index 9038262..6ea1871 100755 --- a/puzzle-gui/src/main/resources/fabric.mod.json +++ b/puzzle-gui/src/main/resources/fabric.mod.json @@ -41,6 +41,7 @@ "fabric": "*" }, "breaks": { - "citresewn": "<=1.0.0+1.18.2" + "citresewn": "<=1.0.0+1.18.2", + "entity_texture_features": "<=3.0.0" } } diff --git a/src/main/resources/assets/puzzle/lang/en_us.json b/src/main/resources/assets/puzzle/lang/en_us.json index 85d5232..8b681e4 100755 --- a/src/main/resources/assets/puzzle/lang/en_us.json +++ b/src/main/resources/assets/puzzle/lang/en_us.json @@ -13,5 +13,5 @@ "puzzle.option.unlimited_model_rotations":"Unlimited Model Rotations", "puzzle.option.bigger_custom_models":"Bigger Custom Models", "puzzle.option.render_layer_overrides":"Render Layer Overrides", - "puzzle.midnightconfig.title":"Puzzle Advanced Configuration" + "puzzle.midnightconfig.title":"Puzzle Advanced Config" } diff --git a/src/main/resources/assets/puzzle/lang/zh-cn.json b/src/main/resources/assets/puzzle/lang/zh-cn.json deleted file mode 100644 index 9a27b21..0000000 --- a/src/main/resources/assets/puzzle/lang/zh-cn.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "puzzle.text.update_available":"有新版本可供升级!", - "puzzle.screen.title":"拼图设置", - "puzzle.page.graphics":"显示设置", - "puzzle.page.resources":"资源设置", - "puzzle.page.performance":"性能设置", - "puzzle.page.misc":"其他设置", - "puzzle.option.check_for_updates":"检查更新", - "puzzle.option.show_version_info":"显示拼图版本信息", - "puzzle.option.resourcepack_splash_screen":"使用纹理包的加载界面", - "puzzle.option.disable_splash_screen_blend":"禁止加载界面徽标渲染", - "puzzle.option.emissive_textures":"发光贴图", - "puzzle.option.unlimited_model_rotations":"无限模型旋转", - "puzzle.option.bigger_custom_models":"更大的自定义模型", - "puzzle.option.render_layer_overrides":"覆盖渲染层", - "puzzle.midnightconfig.title":"拼图高级设置" -} diff --git a/src/main/resources/assets/puzzle/lang/zh-tw.json b/src/main/resources/assets/puzzle/lang/zh_tw.json similarity index 100% rename from src/main/resources/assets/puzzle/lang/zh-tw.json rename to src/main/resources/assets/puzzle/lang/zh_tw.json