update

We don't support disabling parts

dependencies.gradle

@@ -1,12 +1,12 @@
 // Add your dependencies here
 
 dependencies {
-	api('com.github.GTNewHorizons:ForestryMC:4.10.5:dev')
-	implementation('com.github.GTNewHorizons:GTNHLib:0.6.18:dev')
+	api('com.github.GTNewHorizons:ForestryMC:4.10.0:dev')
+	implementation('com.github.GTNewHorizons:GTNHLib:0.6.0:dev')
 
-	devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.7.34-GTNH:dev')
+	devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.7.4-GTNH:dev')
 
-	compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.42:api')
+	compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.39:api')
 	compileOnly('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev')
 	compileOnly("curse.maven:extrabiomesxl-60041:2273301")
 }

gradle.properties

@@ -14,7 +14,7 @@ modId = BinnieCore
 modGroup = binnie
 
 # Whether to use modGroup as the maven publishing group.
-# When false, com.github.GTNewHorizons is used.
+# Due to a history of using JitPack, the default is com.github.GTNewHorizons for all mods.
 useModGroupForPublishing = false
 
 # Updates your build.gradle and settings.gradle automatically whenever an update is available.

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.11.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -86,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -205,7 +206,7 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.

settings.gradle

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

src/main/java/binnie/botany/ceramic/BlockStained.java

@@ -34,7 +34,6 @@ public class BlockStained extends Block implements IBlockMetadata {
 
     public BlockStained() {
         super(Material.glass);
-        setHardness(0.3f);
         setCreativeTab(CreativeTabBotany.instance);
         setBlockName("stained");
     }

src/main/java/binnie/extrabees/ExtraBees.java

@@ -33,7 +33,8 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent;
         name = ExtraBees.EB_MOD_NAME,
         version = Tags.VERSION,
         useMetadata = true,
-        dependencies = "after:BinnieCore")
+        dependencies = "after:BinnieCore",
+        guiFactory = "binnie.extrabees.config.EBConfigGUIFactory")
 public class ExtraBees extends AbstractMod {
 
     public static final String EB_MODID = "ExtraBees";

src/main/java/binnie/extrabees/config/EBConfigGUI.java

@@ -0,0 +1,16 @@
+package binnie.extrabees.config;
+
+import static binnie.extrabees.ExtraBees.EB_MODID;
+import static binnie.extrabees.ExtraBees.EB_MOD_NAME;
+
+import net.minecraft.client.gui.GuiScreen;
+
+import com.gtnewhorizon.gtnhlib.config.ConfigException;
+import com.gtnewhorizon.gtnhlib.config.SimpleGuiConfig;
+
+public class EBConfigGUI extends SimpleGuiConfig {
+
+    public EBConfigGUI(GuiScreen parent) throws ConfigException {
+        super(parent, EB_MODID, EB_MOD_NAME, false, EBConfig.class, EBConfigMachines.class);
+    }
+}

src/main/java/binnie/extrabees/config/EBConfigGUIFactory.java

@@ -0,0 +1,13 @@
+package binnie.extrabees.config;
+
+import net.minecraft.client.gui.GuiScreen;
+
+import com.gtnewhorizon.gtnhlib.config.SimpleGuiFactory;
+
+public class EBConfigGUIFactory implements SimpleGuiFactory {
+
+    @Override
+    public Class<? extends GuiScreen> mainConfigGuiClass() {
+        return EBConfigGUI.class;
+    }
+}

src/main/java/binnie/extratrees/ExtraTrees.java

@@ -41,7 +41,8 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent;
         name = EB_MOD_NAME,
         version = Tags.VERSION,
         useMetadata = true,
-        dependencies = "after:BinnieCore")
+        dependencies = "after:BinnieCore",
+        guiFactory = "binnie.extratrees.config.ETConfigGUIFactory")
 public class ExtraTrees extends AbstractMod {
 
     public static final String ET_MODID = "ExtraTrees";

src/main/java/binnie/extratrees/config/ETConfigGUI.java

@@ -0,0 +1,16 @@
+package binnie.extratrees.config;
+
+import static binnie.extratrees.ExtraTrees.EB_MOD_NAME;
+import static binnie.extratrees.ExtraTrees.ET_MODID;
+
+import net.minecraft.client.gui.GuiScreen;
+
+import com.gtnewhorizon.gtnhlib.config.ConfigException;
+import com.gtnewhorizon.gtnhlib.config.SimpleGuiConfig;
+
+public class ETConfigGUI extends SimpleGuiConfig {
+
+    public ETConfigGUI(GuiScreen parent) throws ConfigException {
+        super(parent, ETConfig.class, ET_MODID, EB_MOD_NAME);
+    }
+}

src/main/java/binnie/extratrees/config/ETConfigGUIFactory.java

@@ -0,0 +1,13 @@
+package binnie.extratrees.config;
+
+import net.minecraft.client.gui.GuiScreen;
+
+import com.gtnewhorizon.gtnhlib.config.SimpleGuiFactory;
+
+public class ETConfigGUIFactory implements SimpleGuiFactory {
+
+    @Override
+    public Class<? extends GuiScreen> mainConfigGuiClass() {
+        return ETConfigGUI.class;
+    }
+}

src/main/java/binnie/extratrees/genetics/ExtraTreeFruitGene.java

@@ -376,7 +376,7 @@ public enum ExtraTreeFruitGene implements IAlleleFruit, IFruitProvider {
 
         float modeYieldMod = 1.0f;
         for (Map.Entry<ItemStack, Float> entry2 : products.entrySet()) {
-            if (world.rand.nextFloat() <= genome.getYield() * modeYieldMod * entry2.getValue() * 5.0f * stage) {
+            if (world.rand.nextFloat() <= genome.getYield() * modeYieldMod * entry2.getValue() * stage) {
                 product2.add(entry2.getKey().copy());
             }
         }

src/main/java/binnie/genetics/machine/isolator/IsolatorComponentLogic.java

@@ -1,7 +1,5 @@
 package binnie.genetics.machine.isolator;
 
-import java.util.Arrays;
-import java.util.Objects;
 import java.util.Random;
 
 import net.minecraft.item.ItemStack;
@@ -17,7 +15,6 @@ import binnie.extrabees.config.EBConfigMachines;
 import binnie.genetics.item.ItemSequence;
 import forestry.api.genetics.AlleleManager;
 import forestry.api.genetics.IAllele;
-import forestry.api.genetics.IChromosome;
 import forestry.api.genetics.IChromosomeType;
 import forestry.api.genetics.IIndividual;
 import forestry.api.genetics.ISpeciesRoot;
@@ -83,15 +80,10 @@ public class IsolatorComponentLogic extends ComponentProcessSetCost implements I
 
         final IChromosomeType[] karyo = root.getKaryotype();
 
-        final IChromosome[] chromosomes = individual.getGenome().getChromosomes();
-        if (Arrays.stream(chromosomes).allMatch(Objects::isNull)) {
-            return;
-        }
-
         IChromosomeType chromosome;
         do {
             chromosome = karyo[rand.nextInt(karyo.length)];
-        } while (chromosomes[chromosome.ordinal()] == null);
+        } while (individual.getGenome().getChromosomes()[chromosome.ordinal()] == null);
 
         final IAllele allele = rand.nextBoolean() ? individual.getGenome().getActiveAllele(chromosome)
                 : individual.getGenome().getInactiveAllele(chromosome);

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

@@ -196,17 +196,11 @@ binniecore.gui.breedingmessage.epithet=Epithet Gained
 binniecore.item.genesis.name=Genesis
 binniecore.item.fluidContainer.missed=Missed Fluid
 
-item.containerCapsule.name=Capsule
 binniecore.item.container.capsule=Capsule
-item.containerRefractory.name=Capsule
 binniecore.item.container.refractory=Capsule
-item.containerCan.name=Can
 binniecore.item.container.can=Can
-item.containerBucket.name=Bucket
 binniecore.item.container.bucket=Bucket
-item.containerGlass.name=Bottle
 binniecore.item.container.glass=Bottle
-item.containerCylinder.name=Cylinder
 binniecore.item.container.cylinder=Cylinder
 
 binniecore.item.container.capsule.acid=Acid Capsule
@@ -297,7 +291,6 @@ binniecore.machine.storage.filterBlocks=Include Blocks
 < %1$s is the name of the pattern >
 binniecore.gui.designer.pattern=%1$s Pattern
 
-item.fieldKit.name=Field Kit
 binniecore.gui.fieldKit=Field Kit
 binniecore.gui.fieldKit.info=The Field Kit analyses bees, trees, flowers and butterflies. All that is required is a piece of paper to jot notes
 
@@ -463,6 +456,3 @@ binniecore.gui.side.west=West
 binniecore.gui.side.south=South
 binniecore.gui.side.insertSide=Insert Side: %s
 binniecore.gui.side.extractSide=Extract Side: %s
-
-item.genesis.name=Genesis
-tile.storage.name=Compartment

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

@@ -1,13 +1,9 @@
 botany.tab.botany=Botany
 
-tile.stained.name=Pigmented Glass
 botany.pigmentedGlass=Pigmented Glass
-tile.ceramic.name=Ceramic Block
 botany.ceramicBlock=Ceramic Block
-tile.ceramicBrick.name=Ceramic Tile
 botany.ceramicTile=Ceramic Tile
 botany.ceramicBricks=Ceramic Bricks
-tile.ceramicPattern.name=Ceramic Block
 botany.strippedCeramicBricks=Striped Ceramic Bricks
 botany.largeCeramicBricks=Large Ceramic Bricks
 botany.splitCeramicTile=Split Ceramic Tile
@@ -134,21 +130,14 @@ botany.moisture.dry=Dry
 botany.moisture.normal=Normal
 botany.moisture.damp=Damp
 
-tile.plant.name=Plant
 botany.plant.weeds=Weeds
 botany.plant.longWeeds=Long Weeds
 botany.plant.veryLongWeeds=Very Long Weeds
 botany.plant.deadFlower=Dead Flower
 botany.plant.decayingFlower=Decaying Flower
 
-tile.soil.name=Soil
-tile.soilNoWeed.name=Soil
 botany.soil.soil=Soil
-tile.loam.name=Loam
-tile.loamNoWeed.name=Loam
 botany.soil.loam=Loam
-tile.flowerbed.name=Flowerbed
-tile.flowerbedNoWeed.name=Flowerbed
 botany.soil.flowerbed=Flowerbed
 botany.soil.weedkiller=Weedkiller
 
@@ -169,20 +158,15 @@ botany.item.tooltip.fertility=Fertility: %dx
 botany.item.tooltip.flowerColor1=%1$s, %2$s Stem
 botany.item.tooltip.flowerColor2=%1$s and %2$s, %3$s Stem
 
-item.soilMeter.name=Soil Meter
 botany.item.soilMeter.name=Soil Meter
-item.pigment.name=Pigment
 botany.item.pigment.name=Pigment
 botany.item.clay.name=Clay
 botany.item.botany.name=%1$s %2$s
-item.pollen.name=Pollen
 botany.item.pollen.tag.name=Pollen
 botany.item.germling.tag.name=Germling
 botany.item.flowerCorrupted.name=Corrupted Flower
-item.database.name=Botanist Database
 botany.item.database.0.name=Botanist Database
 botany.item.database.1.name=Master Botanist Database
-item.misc.name=Powder
 botany.item.powderAsh.name=Ash Powder
 botany.item.powderPulp.name=Pulp Powder
 botany.item.powderMulch.name=Mulch Powder
@@ -198,7 +182,6 @@ item.trowelIron.name=Iron Trowel
 item.trowelGold.name=Gold Trowel
 item.trowelDiamond.name=Diamond Trowel
 
-item.itemFlower.name=Flower
 botany.flower.name=Flower
 botany.flower.dandelion=Dandelion
 botany.flower.poppy=Poppy
@@ -382,7 +365,6 @@ for.binnie.circuit.garden.damp.acid=Garden (Damp, Acidic)
 for.binnie.circuit.garden.damp.neutral=Garden (Damp, Neutral)
 for.binnie.circuit.garden.damp.alkaline=Garden (Damp, Alkaline)
 
-item.insulatedTube.name=Insulated Tube
 botany.tube.name=Insulated Tube
 botany.tube.copper=Copper
 botany.tube.tin=Tin
@@ -474,5 +456,3 @@ botany.gui.database.tab.breeder=Breeder
 
 botany.gui.database.tab.colour.resultant=Resultant Mixes
 botany.gui.database.tab.colour.further=Further Mixes
-
-item.seed.name=Seed

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

@@ -1,7 +1,6 @@
 ##################################################
 ## Items
 
-item.honeyComb.name=Comb
 extrabees.item.comb.barren=Barren Comb
 extrabees.item.comb.rotten=Rotten Comb
 extrabees.item.comb.bone=Bone Comb
@@ -75,7 +74,6 @@ extrabees.item.comb.yellorium=Yellorium Comb
 extrabees.item.comb.cyanite=Cyanite Comb
 extrabees.item.comb.blutonium=Blutonium Comb
 
-item.honeyDrop.name=Drop
 extrabees.item.honeydrop.energy=Energy Drop
 extrabees.item.honeydrop.acid=Acidic Drop
 extrabees.item.honeydrop.poison=Venomous Drop
@@ -106,14 +104,12 @@ extrabees.item.honeydrop.limegreen=Lime Green Tinted Honey
 extrabees.item.honeydrop.magenta=Magenta Tinted Honey
 extrabees.item.honeydrop.lightgray=Light Gray Tinted Honey
 
-item.propolis.name=Propolis
 extrabees.item.propolis.water=Watery Propolis
 extrabees.item.propolis.oil=Oily Propolis
 extrabees.item.propolis.fuel=Petroleum Propolis
 extrabees.item.propolis.creosote=Creosote Propolis
 extrabees.item.propolis.peat=Peat Propolis
 
-item.hiveFrame.name=Hive Frame
 extrabees.item.frame.cocoa=Chocolate Frame
 extrabees.item.frame.cage=Restraint Frame
 extrabees.item.frame.soul=Soul Frame
@@ -131,12 +127,10 @@ extrabees.item.template.corrupted=Corrupted Template
 extrabees.item.template.name=%s Template
 extrabees.item.template.empty=Blank Template
 
-item.dictionary.name=Apiarist Database
 extrabees.item.database=Apiarist Database
 extrabees.item.masterDatabase=Master Apiarist Database
 extrabees.item.database.tooltip=Flora-in-a-box
 
-item.misc.name=Resource
 extrabees.item.scentedGear=Scented Gear
 extrabees.item.diamondShard=Diamond Fragment
 extrabees.item.emeraldShard=Emerald Fragment
@@ -173,7 +167,6 @@ extrabees.block.geneticMachine.name=Genetic Machine
 extrabees.block.advGeneticMachine.name=Advanced Genetic Machine
 extrabees.block.ectoplasm.name=Ectoplasm
 
-tile.hive.name=Hive
 extrabees.block.hive.0=Water Hive
 extrabees.block.hive.1=Rock Hive
 extrabees.block.hive.2=Nether Hive
@@ -201,7 +194,6 @@ extrabees.machine.alveay.lighting.info=The Alveary Lighting tricks bees into thi
 extrabees.machine.alveay.unlighting=Alveary Unlighting
 extrabees.machine.alveay.unlighting.info=The Alveary Unlighting tricks bees into thinking it is night time during the day.
 
-tile.alveary.name=Mutator
 extrabees.machine.alveay.mutator=Mutator
 extrabees.machine.alveay.mutator.info=The Mutator uses certain items in order to encourage bee mutation.
 extrabees.machine.alveay.mutator.tooltip=Mutagenic Agents

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

@@ -1,8 +1,6 @@
 ##################################################
 ## Machines
 
-tile.machine.name=Machine
-
 extratrees.machine.kitchen.bar=Bar
 extratrees.machine.kitchen.bottleRack=Bottle Rack
 
@@ -161,7 +159,6 @@ extratrees.block.tooltip.twoMaterials=%s and %s
 extratrees.block.door.name=%1$s Wood Door
 
 < %1$s is name of wood used for door, %2$s is type of door >
-tile.door.name=Wood Door
 extratrees.block.door.name.adv=%2$s %1$s Wood Door
 extratrees.block.door.type.standard=
 extratrees.block.door.type.solid=Solid
@@ -169,24 +166,19 @@ extratrees.block.door.type.double=Split
 extratrees.block.door.type.full=Full
 
 < %1$s is name of the wood>
-tile.planks.name=Wood Planks
 extratrees.block.plank.name=%1$s Wood Planks
 extratrees.block.log.name=%1$s Wood
-tile.slabs.name=Wood Slab
 extratrees.block.woodslab.name=%1$s Wood Slab
-tile.stairs.name=Stairs
 extratrees.block.woodstairs.name=%1$s Stairs
 extratrees.block.woodfence.name=%1$s Fence
 extratrees.block.woodgate.name=%1$s Gate
 
 < %1$s is the adjective for the fence type, %2$s is the name of the wood >
-tile.multifence.name=Fence
 extratrees.block.multifence.name=%2$s %1$s Gate
 < %3$s is the name of the second wood >
 extratrees.block.multifence.name2=%2$s %1$s & $3$s Gate
 
 < %1$s is name of the design >
-tile.carpentry.name=Wooden Panel/Tile
 extratrees.block.woodentile.name=%1$s Wooden Tile
 extratrees.block.woodenpanel.name=%1$s Wooden Panel
 extratrees.block.stainedglass.name=%1$s Stained Glass
@@ -320,18 +312,14 @@ extratrees.genetics.unknown=<Unknown>
 extratrees.genetics.discoveredBy=Discovered by %s 
 extratrees.genetics.complexity=Complexity: %d 
 
-item.hammer.name=Carpentry Hammer
-extratrees.item.carpentryHammer=Carpentry Hammer
-item.durableHammer.name=Master Carpentry Hammer
-extratrees.item.masterCarpentryHammer=Master Carpentry Hammer
-item.misc.name=Resource
+extratrees.item.carpentryHammer=Master Carpentry Hammer
+extratrees.item.masterCarpentryHammer=Carpentry Hammer
 extratrees.item.sawdust=Sawdust
 extratrees.item.bark=Bark
 extratrees.item.provenGear=Proven Gear
 extratrees.item.woodWax=Wood Polish
 extratrees.item.glassFitting=Glass Fittings
 
-item.food.name=Fruit
 for.extratrees.item.food.apple=Apple
 for.extratrees.item.food.crabapple=Crabapple
 for.extratrees.item.food.orange=Orange
@@ -395,12 +383,10 @@ for.extratrees.item.food.mango=Mango
 for.extratrees.item.food.starfruit=Starfruit
 for.extratrees.item.food.candlenut=Candlenut
 
-item.database.name=Arborist Database
 extratrees.item.database=Arborist Database
 extratrees.item.masterDatabase=Master Arborist Database
 extratrees.item.database.tooltip=Sengir-in-a-can
 
-item.databaseMoth.name=Lepidopterist Database
 extratrees.item.mothDatabase=Lepidopterist Database
 extratrees.item.mothMasterDatabase=Master Lepidopterist Database
 extratrees.item.mothDatabase.tooltip=Binnie's Emporium of Lepidopterans

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

@@ -9,29 +9,22 @@ genetics.item.fieldKit.tooltip.noPaper=No paper
 genetics.item.fieldKit.tooltip.sheetsOfPaper=%d sheets of paper
 genetics.item.fieldKit.tooltip.sheetOfPaper=%d sheet of paper
 
-item.misc.name=Resource
 genetics.item.casingIron.name=Reinforced Casing
 genetics.item.dnaDye.name=DNA Dye
 genetics.item.dyeFluor.name=Fluorescent Dye
 genetics.item.enzyme.name=Enzyme
 genetics.item.growthMedium.name=Growth Medium
 genetics.item.sequencerEmpty.name=Blank Sequence
-item.serum.name=Empty Serum Vial
 genetics.item.serumEmpty.name=Empty Serum Vial
-item.serumArray.name=Empty Serum Array
 genetics.item.genomeEmpty.name=Empty Serum Array
 genetics.item.cylinderEmpty.name=Glass Cylinder
 genetics.item.integratedCircuit.name=Integrated Circuit Board
 genetics.item.integratedCPU.name=Integrated CPU
 genetics.item.casingCircuit.name=Integrated Casing
-item.analyst.name=Analyst
 genetics.item.analyst.name=Analyst
-item.database.name=Gene Database
 genetics.item.database.0.name=Gene Database
 genetics.item.database.1.name=Master Gene Database
-item.registry.name=Registry
 genetics.item.registry.0.name=Registry
-item.masterRegistry.name=Registry
 genetics.item.registry.1.name=Master Registry
 genetics.item.serum.name=%s Serum
 genetics.item.serumArray.name=%s Serum Array
@@ -49,7 +42,6 @@ genetics.gene.charge.one=1 Charge
 genetics.gene.charge.many=%d Charges
 genetics.gene.more=%d more genes. Hold shift to display
 
-item.sequence.name=DNA Sequence
 genetics.sequence.corrupted=Corrupted Sequence
 genetics.sequence.descriptor=%s DNA Sequence
 genetics.sequence.unknown=<Unknown>
@@ -57,7 +49,6 @@ genetics.sequence.unsequenced=Unsequenced
 genetics.sequence.fully=Fully Sequenced
 genetics.sequence.partially=Partially Sequenced (%d%%)
 
-tile.machine.name=Isolator
 genetics.machine.machine.isolator=Isolator
 genetics.machine.machine.isolator.info=The Isolator takes a random allele from a bee, tree or other individual and copies it into an empty sequence vial. This requires the use of ethanol as a solvent and an enzyme to cut up the DNA. The unsequenced serums can then be amplified in a Polymeriser and sequenced in a Sequencer. This process has a small chance to destroy the individual.
 genetics.machine.isolator.error.noIndividual=No individual to isolate
@@ -111,7 +102,6 @@ genetics.machine.genepool.error.noRoom=Not enough room in Tank
 genetics.machine.genepool.error.noEthanol=Not enough Ethanol
 genetics.machine.genepool.error.insufficientEnzyme=Insufficient Enzyme
 
-tile.labMachine.name=Lab Stand
 genetics.machine.labMachine.labMachine=Lab Stand
 
 genetics.machine.labMachine.analyser=Analyzer
@@ -138,7 +128,6 @@ genetics.machine.acclimatiser.error.noIndividual=No Individual to Acclimatise
 genetics.machine.acclimatiser.error.noAcclimatizingItems=No Acclimatising Items
 genetics.machine.acclimatiser.error.invalidAcclimatizingItems=Cannot Acclimatise this individual with these items
 
-tile.advMachine.name=Splicer
 genetics.machine.advMachine.splicer=Splicer
 genetics.machine.advMachine.splicer.info=The Splicer is an incredibly powerful machine that is used to insert genes into individuals. This process is fast, but requires monumental amounts of power.
 genetics.machine.splicer.error.noIndividual=No Individual to Splice
@@ -285,4 +274,4 @@ genetics.nei.tip.temperature=Temperature
 genetics.nei.tip.humidity=Humidity
 genetics.nei.tip.processSpeed=%dx Processing Speed
 genetics.nei.tip.rf=%dx Processing Speed
-genetics.nei.tip.databaseDesc=Open the database and pick up an empty serum. Click the serum on Sequenced gene to apply.
+genetics.nei.tip.databaseDesc=Open the database and pick up an empty serum. Click the serum on Sequenced gene to apply.