Revert Lang Correction (#16)

dependencies.gradle

@@ -1,14 +1,13 @@
 dependencies {
-    api('com.github.GTNewHorizons:Botania:1.12.8-GTNH:dev') {
+    api('com.github.GTNewHorizons:Botania:1.13.10-GTNH:dev') {
         exclude module: 'Baubles'
     }
-    api('com.github.GTNewHorizons:Botanic-horizons:1.1.7-GTNH:dev')
+    api('com.github.GTNewHorizons:Botanic-horizons:1.12.3-GTNH:dev')
     api('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev')
-    api('com.github.GTNewHorizons:Baubles-Expanded:2.1.7-GTNH:dev')
-    compileOnly("com.github.GTNewHorizons:CodeChickenLib:1.3.0:dev")
-    compileOnly("com.github.GTNewHorizons:CodeChickenCore:1.4.2:dev")
-    compileOnly("com.github.GTNewHorizons:NotEnoughItems:2.7.44-GTNH:dev")
-    compileOnly("com.github.GTNewHorizons:CraftTweaker:3.4.1:dev")
+    api('com.github.GTNewHorizons:Baubles-Expanded:2.2.6-GTNH:dev')
+    compileOnly("com.github.GTNewHorizons:CodeChickenCore:1.4.10:dev")
+    compileOnly("com.github.GTNewHorizons:NotEnoughItems:2.8.50-GTNH:dev")
+    compileOnly("com.github.GTNewHorizons:CraftTweaker:3.4.2:dev")
 }
 
 // deps may transitively add Baubles, so we replace it
@@ -17,7 +16,7 @@ project.getConfigurations()
         final DependencySubstitutions ds = c.getResolutionStrategy()
             .getDependencySubstitution();
         ds.substitute(ds.module("com.github.GTNewHorizons:Baubles"))
-            .using(ds.module("com.github.GTNewHorizons:Baubles-Expanded:2.1.7-GTNH"))
+            .using(ds.module("com.github.GTNewHorizons:Baubles-Expanded:2.2.6-GTNH"))
             .withClassifier("dev")
             .because("Baubles-Expanded replaces Baubles");
     });

gradle.properties

@@ -96,7 +96,9 @@ usesMixinDebug = false
 # Specify the location of your implementation of IMixinConfigPlugin. Leave it empty otherwise.
 mixinPlugin =
 
-# Specify the package that contains all of your Mixins. You may only place Mixins in this package or the build will fail!
+# Specify the package that contains all of your Mixins. The package must exist or
+# the build will fail. If you have a package property defined in your mixins.<modid>.json,
+# it must match with this or the build will fail.
 mixinsPackage =
 
 # Specify the core mod entry class if you use a core mod. This class must implement IFMLLoadingPlugin!
@@ -151,7 +153,7 @@ modrinthProjectId =
 #       type can be one of [project, version],
 #       and the name is the Modrinth project or version slug/id of the other mod.
 # Example: required-project:fplib;optional-project:gasstation;incompatible-project:gregtech
-# Note: GTNH Mixins is automatically set as a required dependency if usesMixins = true
+# Note: UniMixins is automatically set as a required dependency if usesMixins = true.
 modrinthRelations =
 
 # Publishing to CurseForge requires you to set the CURSEFORGE_TOKEN environment variable to one of your CurseForge API tokens.
@@ -172,6 +174,12 @@ curseForgeRelations =
 # projects. New projects should not use this parameter.
 # customArchiveBaseName =
 
+# Optional parameter to customize the default working directory used by the runClient* tasks. Relative to the project directory.
+# runClientWorkingDirectory = run/client
+
+# Optional parameter to customize the default working directory used by the runServer* tasks. Relative to the project directory.
+# runServerWorkingDirectory = run/server
+
 # Optional parameter to have the build automatically fail if an illegal version is used.
 # This can be useful if you e.g. only want to allow versions in the form of '1.1.xxx'.
 # The check is ONLY performed if the version is a git tag.

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

settings.gradle

@@ -17,7 +17,7 @@ pluginManagement {
 }
 
 plugins {
-    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.38'
+    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.49'
 }
 
 

src/main/java/ab/common/lib/register/RecipeListAB.java

@@ -821,8 +821,7 @@ public class RecipeListAB implements IModHelper {
                         .add(Aspect.MAGIC, 32).add(Aspect.ELDRITCH, 32).add(Aspect.BEAST, 16).add(Aspect.HUNGER, 16),
                 new ItemStack(ItemListAB.itemAquaSword),
                 new ItemStack[] { new ItemStack(ModItems.rainbowRod), new ItemStack(ItemListAB.itemABResource, 1, 0),
-                        new ItemStack(
-                                (Item) Item.itemRegistry.getObject("dreamcraft:item.MysteriousCrystalGemFlawless")),
+                        new ItemStack((Item) Item.itemRegistry.getObject("dreamcraft:MysteriousCrystalGemFlawless")),
                         new ItemStack(ItemListAB.itemABResource, 1, 0), new ItemStack(ItemListAB.itemNebulaRod),
                         new ItemStack(ModBlocks.dreamwood, 1, 5), new ItemStack(ItemListAB.itemABResource, 1, 5),
                         new ItemStack(ModBlocks.livingwood, 1, 5),
@@ -842,16 +841,16 @@ public class RecipeListAB implements IModHelper {
                 new ItemStack((Item) Item.itemRegistry.getObject("thaumicbases:voidAnvil")),
                 new ItemStack[] { new ItemStack(ModBlocks.terraPlate), new ItemStack(ModItems.rune, 1, 2),
                         OreDict.preference("blockTerrasteel"),
-                        new ItemStack((Item) Item.itemRegistry.getObject("dreamcraft:item.DiamondCoreChip")),
+                        new ItemStack((Item) Item.itemRegistry.getObject("dreamcraft:DiamondCoreChip")),
                         new ItemStack(ModBlocks.terraPlate), new ItemStack(ModItems.rune, 1, 3),
                         OreDict.preference("blockManasteel"),
-                        new ItemStack((Item) Item.itemRegistry.getObject("dreamcraft:item.EssentiaCircuit")),
+                        new ItemStack((Item) Item.itemRegistry.getObject("dreamcraft:EssentiaCircuit")),
                         new ItemStack(ModBlocks.terraPlate), new ItemStack(ModItems.rune, 1, 2),
                         OreDict.preference("blockTerrasteel"),
-                        new ItemStack((Item) Item.itemRegistry.getObject("dreamcraft:item.DiamondCoreChip")),
+                        new ItemStack((Item) Item.itemRegistry.getObject("dreamcraft:DiamondCoreChip")),
                         new ItemStack(ModBlocks.terraPlate), new ItemStack(ModItems.rune, 1, 3),
                         OreDict.preference("blockManasteel"),
-                        new ItemStack((Item) Item.itemRegistry.getObject("dreamcraft:item.EssentiaCircuit")), });
+                        new ItemStack((Item) Item.itemRegistry.getObject("dreamcraft:EssentiaCircuit")), });
 
         Destroyer = ThaumcraftApi.addInfusionCraftingRecipe(
                 "Destroyer",

src/main/resources/assets/ab/lang/en_US.lang

@@ -125,7 +125,7 @@ abmisc.fateBoard.info1=every Elf, hoping to get a valuable prize...
 tc.research_category.AdvancedBotany=Advanced Botany
 tc.research_category.AB_botania=Advanced Botany
 tc.research_name.TerraHoe=Terra Hoe
-tc.research_name.AquaSword=Blade of sea
+tc.research_name.AquaSword=Blade of Sea
 tc.research_name.ManaCharger=Mana Charger
 tc.research_name.MithrillSword=Blade of Space
 tc.research_name.Forge=Forge of Nidavellir
@@ -188,7 +188,7 @@ botania.tagline.advancedPlate=Created from the drawings of dwarves from Nidavell
 botania.page.advancedPlate0=Forge of Nidavellir - a really powerful Dwarf invention for fusing different materials into one whole, the main thing is to know the proportions!<br>This forge was given to the Elves, that is, it came to our land at the time of "Destruction," but... Not for long - it was soon destroyed.
 botania.page.advancedPlate.craft=The Engineering Revolution
 botania.page.advancedPlate.structure=Forge of Nidavellir
-botania.page.advancedPlate.abCraft0=Creating everyone's favorite terrastal
+botania.page.advancedPlate.abCraft0=Creating everyone's favorite terrasteel
 botania.page.advancedPlate.abCraft1=Burn My Star...
 
 botania.entry.lebethronWood=Lebethron Wood
@@ -211,7 +211,7 @@ botania.page.mithrill.abCraft=Gaia Spirit Ingot [Remake]
 botania.page.mithrill1=The Material Destroyer - a harsh tool based on a global catastrophe in the past. <br>He is perfectly capable of breaking any block almost instantly. His speed is so high that it was necessary to create a *Fuse* in him - that is, to turn him off/on.
 botania.page.mithrill.craft=The hip never breaks :(
 
-botania.entry.manaContainer=Mana Container's
+botania.entry.manaContainer=Mana Container
 botania.tagline.manaContainer=A mana depot for madmen
 botania.page.manaContainer0=Mana Container - are levitating mana vessels, somewhat reminiscent of normal mana pools, but definitely not the capacity, which is exceeded several times over!<br>The only thing mana containers are worse than pools is the lack of charging Mana Tools and creating Mana items.
 botania.page.manaContainer.craft0=64 mana pools!
@@ -232,7 +232,7 @@ botania.page.terraHoe.craft=Auto Harvest
 
 botania.entry.manaRings=Mana Rings
 botania.tagline.manaRings=Take a lot of mana with you!
-botania.page.manaRings0=Mana rings are highly sought-after accessories for nerfs. And it is not always convenient to take several, but everything is limited by the properties of the material from which the ring was made. <br>Mithrill and Nebula Fragment, excellent analogues to the usual terrastal or manastal.
+botania.page.manaRings0=Mana rings are highly sought-after accessories for nerfs. And it is not always convenient to take several, but everything is limited by the properties of the material from which the ring was made. <br>Mithrill and Nebula Fragment, excellent analogues to the usual terrasteel or manasteel.
 botania.page.manaRings.craft0=8 mana pools!
 botania.page.manaRings.craft1=48 mana pools!
 
@@ -250,13 +250,13 @@ botania.page.mithrillSword.craft=It'll look great in your hand!
 
 botania.entry.dictarius=Dictarius
 botania.tagline.dictarius=Turns everything around in one word, be careful
-botania.page.dictarius0=Dictarius - the most open flower of all, which tries to express its opinion, but more often than not, it tries to force those around it to take some action. <br>Overall, if you don't listen to it, it's quite a great way to extract mana! The more listeners around him, the more mana.
+botania.page.dictarius0=Dictarius - the most open flower of all, which tries to express its opinion, but more often than not, it tries to force those around it to take some action. <br>Overall, if you don't listen to it, it's quite a great way to extract mana! The more listeners around it, the more mana.
 botania.page.dictarius1=Dictarius has one weakness - a large cluster of similar flowers, discussions with such talkative opponents gradually poison him - as a result Dictarius dies!
 botania.page.dictarius.petalCraft=Not the best conversationalist at night
 
 botania.entry.aspecolus=Aspecolus
 botania.tagline.aspecolus=Will gladly get inside your head
-botania.page.aspecolus0=Aspecolus is at first glance a standard flower. But as soon as you get close, you feel as if someone is digging into your head! It's not exactly pleasant... <br>But, the Taumoturges found something special about it, and now use the miraculous flower as a forced meditation.
+botania.page.aspecolus0=Aspecolus is at first glance a standard flower. But as soon as you get close, you feel as if someone is digging into your head! It's not exactly pleasant... <br>But, the Thaumaturges found something special about it, and now use the miraculous flower as a forced meditation.
 botania.page.aspecolus.petalCraft=Mini psychologist
 
 botania.entry.nebula=Nebula
@@ -276,7 +276,7 @@ botania.page.blackHalo.craft=A stonemason's dream
 
 botania.entry.antigravityCharm=Sphere of attraction
 botania.tagline.antigravityCharm=What is physics?
-botania.page.antigravityCharm0=The sphere of attraction is a mystical tool capable of stopping the movement of any falling blocks. <br>Now you can safely walk around without the fear that you will be crushed by sand, or anvil.
+botania.page.antigravityCharm0=The sphere of attraction is a mystical tool capable of stopping the movement of any falling blocks. <br>Now you can safely walk around without the fear that you will be crushed by sand or anvils.
 botania.page.antigravityCharm.craft=1 : 0 in favor of Minecrafters
 
 botania.entry.manaCharger=Mana Charger
@@ -286,7 +286,7 @@ botania.page.manaCharger.craft=Quick Charge
 
 botania.entry.nebulaArmor=Nebula Armor
 botania.tagline.nebulaArmor=Unbreakable Nerd outfit
-botania.page.nebulaArmor0=Nebula Armor is a powerful nerf gear created with Nebula Fragments and Terrastal armor. <br>Each piece of equipment has its own unique properties, which depend on the amount of mana, the less mana, the weaker the protective properties of the armor.
+botania.page.nebulaArmor0=Nebula Armor is a powerful nerf gear created with Nebula Fragments and Terrasteel armor. <br>Each piece of equipment has its own unique properties, which depend on the amount of mana, the less mana, the weaker the protective properties of the armor.
 botania.page.nebulaArmor1=Characteristics of each armor item: <br>Nebula Helmet - boosts health <br>Nebula Chestplate - allows the wearer to fly, and also has a throwback resistance <br>Nebula Leggings - increase jump height <br>Nebula Boots - accelerate the host
 botania.page.nebulaArmor.craft0=Face of Space
 botania.page.nebulaArmor.craft1=Shall we fly?
@@ -299,7 +299,7 @@ botania.page.freyrSlingshot0=Freyr Slingshot - one of Pantheon's mythical items.
 botania.page.freyrSlingshot1=In addition, when a Tree is hit by Natural Flash, it is enveloped in an instant by a previously unknown vines!<br>1) Fertile Liana - speeds up the growth of the seeds underneath<br>2) The Glowing Fertile Liana is the counterpart of the Fertile Liana, but is also capable of generating gold nuggets!
 
 botania.entry.engineerHopper=Engineer Hopper
-botania.tagline.engineerHopper=Hide not beautiful mechanisms deep underground! Make it beautiful!
+botania.tagline.engineerHopper=Don't hide beautiful mechanisms deep underground! Make it beautiful!
 botania.page.engineerHopper0=Engineer Hopper is a real boon for designers-engineers! Thanks to it - you can safely hide the mechanisms, from prying eyes, or just for aesthetic pleasure.<br>According to preliminary information from Alphirine - such funnels were used in many advanced worlds, such as Asgard and Nidavellir.
 botania.page.engineerHopper1=See the item descriptions on the following pages.
 botania.page.engineerHopper2=Point 1 - a place to specify the storage facility from which things will be taken for transportation. <br>Point 2 - A place to specify the vault where things will come in. <br>Point 3 - Wand of the Forest icon: shows where you can bind the vault.
@@ -353,7 +353,7 @@ botania.page.azartFlower0=Ardent Azarcissus - The flower is a gambler, one of th
 botania.page.azartFlower.petalCraft=Just give him the will, and he'll give you mana.
 
 botania.entry.sphereNavigation=Sphere of Navigation
-botania.tagline.sphereNavigation=It will show you and show you the way anywhere!	
+botania.tagline.sphereNavigation=It will show you the way anywhere!
 botania.page.sphereNavigation0=Sphere of Navigation is a relic with the unique property of finding the specified block, through blocks, and marking the location! <br>For such a pleasure it is required to pay mana, and not a small amount in the long run.
 
 botania.entry.hornPlenty=Horn of Plenty