From e812d33caff79f229942d6b0ae75dcf550cb05c0 Mon Sep 17 00:00:00 2001 From: Caedis Date: Tue, 13 May 2025 19:09:33 -0500 Subject: [PATCH 1/7] Replace Baubles with Baubles Expanded (#81) --- dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.gradle b/dependencies.gradle index 7e2c9ee9f..a833b5998 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,7 +1,7 @@ // Add your dependencies here dependencies { - api('com.github.GTNewHorizons:Baubles:1.0.4:dev') + api('com.github.GTNewHorizons:Baubles-Expanded:2.1.7-GTNH:dev') api('com.github.GTNewHorizons:GTNHLib:0.6.11:dev') compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.42:api') {transitive=false} From 7b767d52c5692e98e9f4fd99b80b889c0dbbf399 Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Fri, 16 May 2025 18:32:31 +0200 Subject: [PATCH 2/7] update --- dependencies.gradle | 6 +++--- gradle.properties | 2 +- settings.gradle | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index a833b5998..59c17fcc4 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -2,12 +2,12 @@ dependencies { api('com.github.GTNewHorizons:Baubles-Expanded:2.1.7-GTNH:dev') - api('com.github.GTNewHorizons:GTNHLib:0.6.11:dev') + api('com.github.GTNewHorizons:GTNHLib:0.6.22:dev') compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.42:api') {transitive=false} compileOnly('com.github.GTNewHorizons:ForgeMultipart:1.6.2:dev') {transitive=false} - devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.7.29-GTNH:dev') - compileOnly('com.github.GTNewHorizons:Railcraft:9.16.3:api') {transitive=false} + devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.7.44-GTNH:dev') + compileOnly('com.github.GTNewHorizons:Railcraft:9.16.26:api') {transitive=false} compileOnly('com.github.GTNewHorizons:StorageDrawers:2.1.0-GTNH:api') {transitive=false} compileOnly('curse.maven:cofh-lib-220333:2388748') compileOnly('curse.maven:minefactory-reloaded-66672:2366150') diff --git a/gradle.properties b/gradle.properties index bdf4abc32..63cabb222 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,7 +14,7 @@ modId = Botania modGroup = vazkii.botania # Whether to use modGroup as the maven publishing group. -# Due to a history of using JitPack, the default is com.github.GTNewHorizons for all mods. +# When false, com.github.GTNewHorizons is used. useModGroupForPublishing = false # Updates your build.gradle and settings.gradle automatically whenever an update is available. diff --git a/settings.gradle b/settings.gradle index 42601a0f9..ff436f2c4 100644 --- a/settings.gradle +++ b/settings.gradle @@ -17,7 +17,7 @@ pluginManagement { } plugins { - id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.36' + id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.38' } From bcf96ed1304ea0935f92fe591f879d4eb4e45576 Mon Sep 17 00:00:00 2001 From: brandyn Date: Mon, 26 May 2025 02:38:18 +0100 Subject: [PATCH 3/7] Add configurable F3 Debug (#78) Co-authored-by: Maya <10861407+serenibyss@users.noreply.github.com> --- .../vazkii/botania/client/core/handler/DebugHandler.java | 2 +- .../vazkii/botania/common/core/handler/ConfigHandler.java | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java b/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java index 9e6055b7a..f1cf7a14d 100644 --- a/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java @@ -35,7 +35,7 @@ public final class DebugHandler { @SubscribeEvent public void onDrawDebugText(RenderGameOverlayEvent.Text event) { World world = Minecraft.getMinecraft().theWorld; - if(Minecraft.getMinecraft().gameSettings.showDebugInfo) { + if(Minecraft.getMinecraft().gameSettings.showDebugInfo && ConfigHandler.showF3Debug) { event.left.add(null); String version = LibMisc.VERSION; if(version.contains("GRADLE")) diff --git a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java index 7276e58e0..b6e80ff45 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java @@ -48,6 +48,8 @@ public final class ConfigHandler { public static boolean enableDefaultRecipes = true; + public static boolean showF3Debug = true; + public static boolean useShaders = true; public static boolean lexiconRotatingItems = true; public static boolean lexiconJustifiedText = false; @@ -210,6 +212,9 @@ public final class ConfigHandler { desc = "The ID of the dimension to use"; fancySkyboxDimensions = loadPropIntSet("fancySkybox.customDimID", desc, fancySkyboxDimensions); + desc = "Turn on or off the debug info in the F3 screen ingame"; + showF3Debug = loadPropBool("showF3Debug", desc, showF3Debug); + desc = "The height of the mana display bar in above the XP bar. You can change this if you have a mod that changes where the XP bar is."; manaBarHeight = loadPropInt("manaBar.height", desc, manaBarHeight); From c387a30be881003e07209679c262715fcceb30f2 Mon Sep 17 00:00:00 2001 From: Maya <10861407+serenibyss@users.noreply.github.com> Date: Sun, 25 May 2025 19:38:30 -0600 Subject: [PATCH 4/7] update --- dependencies.gradle | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 59c17fcc4..4cf782fc3 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,14 +1,14 @@ // Add your dependencies here dependencies { - api('com.github.GTNewHorizons:Baubles-Expanded:2.1.7-GTNH:dev') - api('com.github.GTNewHorizons:GTNHLib:0.6.22:dev') + api('com.github.GTNewHorizons:Baubles-Expanded:2.1.8-GTNH:dev') + api('com.github.GTNewHorizons:GTNHLib:0.6.24:dev') compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.42:api') {transitive=false} compileOnly('com.github.GTNewHorizons:ForgeMultipart:1.6.2:dev') {transitive=false} - devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.7.44-GTNH:dev') - compileOnly('com.github.GTNewHorizons:Railcraft:9.16.26:api') {transitive=false} - compileOnly('com.github.GTNewHorizons:StorageDrawers:2.1.0-GTNH:api') {transitive=false} + devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.7.45-GTNH:dev') + compileOnly('com.github.GTNewHorizons:Railcraft:9.16.28:api') {transitive=false} + compileOnly('com.github.GTNewHorizons:StorageDrawers:2.1.2-GTNH:api') {transitive=false} compileOnly('curse.maven:cofh-lib-220333:2388748') compileOnly('curse.maven:minefactory-reloaded-66672:2366150') compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') From 36deb608557f9621a24663f4fcb913c324cbb45f Mon Sep 17 00:00:00 2001 From: "Nikolay S." Date: Fri, 6 Jun 2025 15:31:18 -0500 Subject: [PATCH 5/7] Add missing equals sign (#83) --- src/main/resources/assets/botania/lang/ru_RU.lang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/assets/botania/lang/ru_RU.lang b/src/main/resources/assets/botania/lang/ru_RU.lang index 452e83f05..3f4824e4f 100644 --- a/src/main/resources/assets/botania/lang/ru_RU.lang +++ b/src/main/resources/assets/botania/lang/ru_RU.lang @@ -752,7 +752,7 @@ tile.botania:blockManaQuartz.name=Блок манакварца tile.botania:chiseledManaQuartz.name=Резной блок манакварца tile.botania:pillarManaQuartz.name=Колонна из манакварца tile.botania:quartzSlabManaHalf.name=Плита из манакварца -tile.botania:quartzSlabManaFull.nameПлита из манакварца +tile.botania:quartzSlabManaFull.name=Плита из манакварца tile.botania:quartzStairsMana.name=Ступеньки из манакварца tile.botania:blockBlazeQuartz.name=Блок пламенного кварца tile.botania:chiseledBlazeQuartz.name=Резной блок пламенного кварца From 72da2272d15313b4a8ef62104827520df707a64a Mon Sep 17 00:00:00 2001 From: "Nikolay S." Date: Fri, 6 Jun 2025 15:57:18 -0500 Subject: [PATCH 6/7] Fix the rest of the lang file mistakes in Botania (#84) --- src/main/resources/assets/botania/lang/en_US.lang | 2 +- src/main/resources/assets/botania/lang/zh_CN.lang | 2 +- src/main/resources/assets/botania/lang/zh_TW.lang | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 5f032b2d9..03a44a7ec 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -199,7 +199,7 @@ botania.nei.quickInfo:item.bone~0=You're gonna have a bad time botania.nei.quickInfo:item.lexicon~0=What exactly did you expect? botania.nei.quickInfo:item.terrasteel~4=You can get Terrasteel by tossing the right materials on a Terrestrial Agglomeration Plate botania.nei.quickInfo:item.enderAirBottle~15=You can get this by right clicking with a Glass Bottle while in the End -primus + # BUILDCRAFT INTEGRATION botania.triggers.manaDetector=Mana Burst botania.triggers.manaEmpty=Mana Empty diff --git a/src/main/resources/assets/botania/lang/zh_CN.lang b/src/main/resources/assets/botania/lang/zh_CN.lang index 6ce69b025..8b57197ba 100644 --- a/src/main/resources/assets/botania/lang/zh_CN.lang +++ b/src/main/resources/assets/botania/lang/zh_CN.lang @@ -183,7 +183,7 @@ botania.nei.quickInfo:item.bone~0=你要倒霉了 botania.nei.quickInfo:item.lexicon~0=你期待着什么? botania.nei.quickInfo:item.terrasteel~4=将正确的材料放在泰拉凝聚板上以制作泰拉钢 botania.nei.quickInfo:item.enderAirBottle~15=要获取它,只需在在末地用玻璃瓶右击 -primus + # BUILDCRAFT INTEGRATION botania.triggers.manaDetector=魔力脉冲 botania.triggers.manaEmpty=魔力为0 diff --git a/src/main/resources/assets/botania/lang/zh_TW.lang b/src/main/resources/assets/botania/lang/zh_TW.lang index 3b4fc329c..aac992316 100644 --- a/src/main/resources/assets/botania/lang/zh_TW.lang +++ b/src/main/resources/assets/botania/lang/zh_TW.lang @@ -2672,7 +2672,7 @@ botania.page.manaAlchemy21=將&1硬化黏土&0變成&1紅沙&0 botania.page.manaAlchemy22=粉碎&1黏土&0&1和磚塊&0 botania.page.manaAlchemy23=製作&1劣質土&0 botania.page.manaAlchemy24=&1草類&0的轉化 -botania.page.manaAlchemy25尋常花之間轉化 +botania.page.manaAlchemy25=尋常花之間轉化 # -- BOTANICAL BREWERY botania.entry.brewery=植物釀造 From 23e4f6760db147fb2c863306d96352b1594e41d1 Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Sun, 8 Jun 2025 11:55:28 +0200 Subject: [PATCH 7/7] update --- dependencies.gradle | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 4cf782fc3..6fdbc82e5 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -2,12 +2,12 @@ dependencies { api('com.github.GTNewHorizons:Baubles-Expanded:2.1.8-GTNH:dev') - api('com.github.GTNewHorizons:GTNHLib:0.6.24:dev') + api('com.github.GTNewHorizons:GTNHLib:0.6.30:dev') - compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.42:api') {transitive=false} - compileOnly('com.github.GTNewHorizons:ForgeMultipart:1.6.2:dev') {transitive=false} - devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.7.45-GTNH:dev') - compileOnly('com.github.GTNewHorizons:Railcraft:9.16.28:api') {transitive=false} + compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.43:api') {transitive=false} + compileOnly('com.github.GTNewHorizons:ForgeMultipart:1.6.4:dev') {transitive=false} + devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.7.51-GTNH:dev') + compileOnly('com.github.GTNewHorizons:Railcraft:9.16.30:api') {transitive=false} compileOnly('com.github.GTNewHorizons:StorageDrawers:2.1.2-GTNH:api') {transitive=false} compileOnly('curse.maven:cofh-lib-220333:2388748') compileOnly('curse.maven:minefactory-reloaded-66672:2366150')