Merge pull request #22 from Runakai1/ChaddyMergeBee

Add All Mighty Merge Master

.github/workflows/build-and-test.yml

@@ -1,5 +1,3 @@
-# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time
-# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
 
 name: Build and test
 
@@ -11,35 +9,5 @@ on:
 
 jobs:
   build-and-test:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-      with:
-        fetch-depth: 0
-
-    - name: Set up JDK 8
-      uses: actions/setup-java@v2
-      with:
-        java-version: '8'
-        distribution: 'adopt'
-        cache: gradle
-
-    - name: Grant execute permission for gradlew
-      run: chmod +x gradlew
-
-    - name: Setup the workspace
-      run: ./gradlew setupCIWorkspace
-
-    - name: Build the mod
-      run: ./gradlew build
-
-    - name: Run server for 1.5 minutes
-      run: |
-        mkdir run
-        echo "eula=true" > run/eula.txt
-        timeout 90 ./gradlew runServer 2>&1 | tee -a server.log || true
-
-    - name: Test no errors reported during server run
-      run: |
-        chmod +x .github/scripts/test-no-error-reports.sh
-        .github/scripts/test-no-error-reports.sh
+    uses: GTNewHorizons/GTNH-Actions-Workflows/.github/workflows/build-and-test.yml@master
+    secrets: inherit

.github/workflows/release-tags.yml

@@ -1,51 +1,14 @@
-# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time
-# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
 
 name: Release tagged build
 
 on:
   push:
-    tags:
-      - '*'
+    tags: [ '*' ]
+
+permissions:
+  contents: write
 
 jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-
-      - name: Set release version
-        run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
-
-      - name: Set up JDK 8
-        uses: actions/setup-java@v2
-        with:
-          java-version: '8'
-          distribution: 'adopt'
-          cache: gradle
-
-      - name: Grant execute permission for gradlew
-        run: chmod +x gradlew
-
-      - name: Setup the workspace
-        run: ./gradlew setupCIWorkspace
-
-      - name: Build the mod
-        run: ./gradlew build
-
-      - name: Release under current tag
-        uses: "marvinpinto/action-automatic-releases@latest"
-        with:
-          repo_token: "${{ secrets.GITHUB_TOKEN }}"
-          automatic_release_tag: "${{ env.RELEASE_VERSION }}"
-          prerelease: false
-          title: "${{ env.RELEASE_VERSION }}"
-          files: build/libs/*.jar
-
-      - name: Publish to Maven
-        run: ./gradlew publish
-        env:
-          MAVEN_USER: ${{ secrets.MAVEN_USER }}
-          MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
+  release-tags:
+    uses: GTNewHorizons/GTNH-Actions-Workflows/.github/workflows/release-tags.yml@master
+    secrets: inherit

src/main/java/binnie/core/genetics/ManagerGenetics.java

@@ -211,9 +211,9 @@ public class ManagerGenetics extends ManagerBase {
             if (o1 instanceof IAlleleInteger && o2 instanceof IAlleleInteger && !(o1 instanceof AlleleColor)) {
                 return Integer.valueOf(((IAlleleInteger) o1).getValue()).compareTo(((IAlleleInteger) o2).getValue());
             }
-            if (o1.getName() != null && o2.getName() != null) {
-                return o1.getName().compareTo(o2.getName());
-            }
+            //            if (o1.getName() != null && o2.getName() != null) {
+            //                return o1.getName().compareTo(o2.getName());
+            //            }
             return o1.getUID().compareTo(o2.getUID());
         }
     }

src/main/java/binnie/extrabees/apiary/ModuleApiary.java

@@ -32,13 +32,13 @@ public class ModuleApiary implements IInitializable {
                 BinnieCore.proxy.createObject("binnie.core.machines.RendererMachine"));
         ModuleApiary.blockComponent = machineGroup.getBlock();
         AlvearyMutator.addMutationItem(new ItemStack(Blocks.soul_sand), 1.5f);
-        AlvearyMutator.addMutationItem(Mods.ic2.stack("UranFuel"), 4.0f);
-        AlvearyMutator.addMutationItem(Mods.ic2.stack("MOXFuel"), 10.0f);
-        AlvearyMutator.addMutationItem(Mods.ic2.stack("Plutonium"), 8.0f);
-        AlvearyMutator.addMutationItem(Mods.ic2.stack("smallPlutonium"), 5.0f);
-        AlvearyMutator.addMutationItem(Mods.ic2.stack("Uran235"), 4.0f);
-        AlvearyMutator.addMutationItem(Mods.ic2.stack("smallUran235"), 2.5f);
+        AlvearyMutator.addMutationItem(Mods.ic2.stack("UranFuel"), 8.0f);
+        AlvearyMutator.addMutationItem(Mods.ic2.stack("Plutonium"), 15.0f);
+        AlvearyMutator.addMutationItem(Mods.ic2.stack("smallPlutonium"), 9.0f);
+        AlvearyMutator.addMutationItem(Mods.ic2.stack("Uran235"), 10.0f);
+        AlvearyMutator.addMutationItem(Mods.ic2.stack("smallUran235"), 5.5f);
         AlvearyMutator.addMutationItem(Mods.ic2.stack("Uran238"), 2.0f);
+        AlvearyMutator.addMutationItem(new ItemStack(Items.nether_star), 50.0f);
         AlvearyMutator.addMutationItem(new ItemStack(Items.ender_pearl), 2.0f);
         AlvearyMutator.addMutationItem(new ItemStack(Items.ender_eye), 4.0f);
 

src/main/java/binnie/extrabees/genetics/ExtraBeeBranchDefinition.java

@@ -283,7 +283,7 @@ public enum ExtraBeeBranchDefinition implements IBranchDefinition {
     FTB("Eftebeapis") {
         @Override
         protected void setBranchProperties(IAllele[] template) {
-            AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWER);
+            AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.FASTEST);
             AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.NORMAL);
             AlleleHelper.instance.set(template, EnumBeeChromosome.EFFECT, AlleleEffect.effectBeatific);
             AlleleHelper.instance.set(template, EnumBeeChromosome.FERTILITY, EnumAllele.Fertility.MAXIMUM);

src/main/java/binnie/extrabees/genetics/ExtraBeeDefinition.java

@@ -1638,6 +1638,45 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
             registerMutation(BeeDefinition.ENDED, RELIC, 2).restrictPerson("jadedcat");
         }
     },
+    CHAD(ExtraBeeBranchDefinition.FTB, "merciboocoup", true, new Color(0x2157DB), new Color(0xD2ABD1)) {
+        ItemStack product = new ItemStack(Items.cake, 1);
+
+        @Override
+        protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
+            beeSpecies
+                    .addProduct(product, 1f)
+                    .addSpecialty(Mods.forestry.stack("pollenFertile"), 0.50f)
+                    .addSpecialty(EnumHoneyComb.MILK.get(1), 0.55f)
+                    .setIsNotCounted()
+                    .setHasEffect();
+        }
+
+        protected void setAlleles(IAllele[] template) {
+            AlleleHelper.instance.set(template, EnumBeeChromosome.NOCTURNAL, true);
+            AlleleHelper.instance.set(template, EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.BOTH_5);
+            AlleleHelper.instance.set(template, EnumBeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.BOTH_5);
+            AlleleHelper.instance.set(
+                    template, EnumBeeChromosome.EFFECT, AlleleHelper.getAllele(ExtraBeesEffect.BIRTHDAY.getUID()));
+        }
+
+        @Override
+        protected void registerMutations() {
+            String[] names = {
+                "Runakai",
+                "boubou_19",
+                "Alastors_Game",
+                "BlueWeabo",
+                "Lewis_Saber",
+                "True_Aurastorm",
+                "minecraft7771",
+                "mitchej123",
+                "_Timbo",
+                "kuba6000",
+                "DreamMasterXXL"
+            };
+            registerMutation(BeeDefinition.CULTIVATED, CELEBRATORY, 5).restrictedByGroupOfPersons(names);
+        }
+    },
 
     /* AUSTERE BRANCH */
     HAZARDOUS(BeeBranchDefinition.AUSTERE, "infensus", true, new Color(0xb06c28), new Color(0xffdc16)) {

src/main/java/binnie/extrabees/genetics/ExtraBeeMutation.java

@@ -1,8 +1,6 @@
 package binnie.extrabees.genetics;
 
-import binnie.extrabees.genetics.requirements.DummyMutationCondition;
-import binnie.extrabees.genetics.requirements.IMutationRequirement;
-import binnie.extrabees.genetics.requirements.RequirementPerson;
+import binnie.extrabees.genetics.requirements.*;
 import forestry.api.apiculture.BeeManager;
 import forestry.api.apiculture.IAlleleBeeSpecies;
 import forestry.api.apiculture.IBeeGenome;
@@ -51,4 +49,10 @@ public class ExtraBeeMutation extends BeeMutation implements IBeeMutationCustom
         requirements.add(requirement);
         addMutationCondition(new DummyMutationCondition(requirement));
     }
+
+    public void restrictedByGroupOfPersons(String[] nicknames) {
+        RequirementGroupOfPersons requirement = new RequirementGroupOfPersons(nicknames);
+        requirements.add(requirement);
+        addMutationCondition(new DummyMutationConditionGroupPersons(requirement));
+    }
 }

src/main/java/binnie/extrabees/genetics/ExtraBeesFlowers.java

@@ -39,7 +39,8 @@ public enum ExtraBeesFlowers implements IFlowerProvider, IAlleleFlowers, IChromo
     LEAVES,
     SAPLING,
     FRUIT,
-    MYSTICAL;
+    MYSTICAL,
+    BEDROCK;
 
     protected boolean dominant;
 
@@ -113,6 +114,9 @@ public enum ExtraBeesFlowers implements IFlowerProvider, IAlleleFlowers, IChromo
 
             case WOOD:
                 return new ItemStack[] {new ItemStack(Blocks.log)};
+
+            case BEDROCK:
+                return new ItemStack[] {new ItemStack(Blocks.bedrock)};
         }
         return new ItemStack[0];
     }
@@ -162,6 +166,8 @@ public enum ExtraBeesFlowers implements IFlowerProvider, IAlleleFlowers, IChromo
 
             case MYSTICAL:
                 return block == Mods.botania.block("flower");
+            case BEDROCK:
+                return block == Blocks.bedrock;
         }
         return false;
     }

src/main/java/binnie/extrabees/genetics/requirements/DummyMutationConditionGroupPersons.java

@@ -0,0 +1,34 @@
+package binnie.extrabees.genetics.requirements;
+
+import forestry.api.core.IClimateProvider;
+import forestry.api.genetics.IAllele;
+import forestry.api.genetics.IGenome;
+import forestry.api.genetics.IMutationCondition;
+import net.minecraft.world.World;
+
+public class DummyMutationConditionGroupPersons implements IMutationCondition {
+    private final RequirementGroupOfPersons requirement;
+
+    public DummyMutationConditionGroupPersons(RequirementGroupOfPersons requirement) {
+        this.requirement = requirement;
+    }
+
+    @Override
+    public float getChance(
+            World world,
+            int x,
+            int y,
+            int z,
+            IAllele allele0,
+            IAllele allele1,
+            IGenome genome0,
+            IGenome genome1,
+            IClimateProvider climate) {
+        return 1.0F;
+    }
+
+    @Override
+    public String getDescription() {
+        return requirement.getDescription();
+    }
+}

src/main/java/binnie/extrabees/genetics/requirements/RequirementGroupOfPersons.java

@@ -0,0 +1,27 @@
+package binnie.extrabees.genetics.requirements;
+
+import binnie.core.util.I18N;
+import forestry.api.apiculture.IBeeHousing;
+import forestry.api.genetics.IAllele;
+import forestry.api.genetics.IGenome;
+import java.util.Arrays;
+import java.util.List;
+
+public class RequirementGroupOfPersons implements IMutationRequirement {
+    protected List<String> names;
+
+    public RequirementGroupOfPersons(String[] name) {
+        this.names = Arrays.asList(name);
+    }
+
+    @Override
+    public String getDescription() {
+        return I18N.localise("extrabees.genetics.requirements.user", names);
+    }
+
+    @Override
+    public boolean fufilled(IBeeHousing housing, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1) {
+        String ownerName = housing.getOwner().getName();
+        return ownerName != null && names.contains(ownerName); // ownerName.contains(name);
+    }
+}

src/main/java/binnie/genetics/craftgui/ControlGene.java

@@ -11,11 +11,14 @@ import binnie.core.craftgui.controls.core.IControlValue;
 import binnie.core.craftgui.events.EventMouse;
 import binnie.core.craftgui.geometry.IPoint;
 import binnie.core.craftgui.minecraft.Window;
+import binnie.core.util.I18N;
 import binnie.genetics.api.IGene;
 import binnie.genetics.core.GeneticsTexture;
 import binnie.genetics.genetics.Engineering;
+import forestry.api.genetics.IAlleleSpecies;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.EnumChatFormatting;
 
 public class ControlGene extends Control implements IControlValue<IGene>, ITooltip {
     protected IGene gene;
@@ -30,6 +33,11 @@ public class ControlGene extends Control implements IControlValue<IGene>, IToolt
     public void getTooltip(Tooltip tooltip) {
         String cName = Binnie.Genetics.getSystem(gene.getSpeciesRoot()).getChromosomeName(gene.getChromosome());
         tooltip.add(cName + ": " + gene.getName());
+        if (gene.getAllele() instanceof IAlleleSpecies) {
+            tooltip.add(I18N.localise(
+                    "binniecore.gui.database.branch.discoveredBy",
+                    ((IAlleleSpecies) gene.getAllele()).getAuthority() + EnumChatFormatting.RESET));
+        }
         if (isMouseOver() && canFill(Window.get(this).getHeldItemStack())) {
             tooltip.add("Left click to assign gene");
             IGene existingGene = Engineering.getGene(

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

@@ -439,6 +439,8 @@ extrabees.species.lightgray.name=Ashen
 extrabees.species.celebratory.name=Celebratory
 extrabees.species.jaded.name=Jaded
 extrabees.species.jaded.desc=I bred all the bees and all I got is some bloody purple dye!|Jaded, Sengir's Chosen
+extrabees.species.chad.name=Chad
+extrabees.species.chad.desc=GTNH Bienen: Das Beste Was Es Gibt.
 extrabees.species.glowstone.name=Glowering
 extrabees.species.hazardous.name=Hazardous
 extrabees.species.nickel.name=Lustered

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

@@ -580,6 +580,8 @@ extrabees.species.celebratory.name=Праздничная
 # Мерзкая ветвь
 extrabees.species.jaded.name=Изнурённая
 extrabees.species.jaded.desc=Я разводил этих пчёл и всё, что я получил - это кроваво-фиолетовый краситель!|Jaded, Sengir's Chosen
+extrabees.species.chad.name=конфетти
+extrabees.species.chad.desc=GTNH Bienen: Das Beste Was Es Gibt.
 
 # Суровая ветвь
 extrabees.species.hazardous.name=Опасная

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

@@ -64,7 +64,7 @@ extrabees.item.comb.limegreen=染色蜂窝（黄绿）
 extrabees.item.comb.magenta=染色蜂窝（品红）
 extrabees.item.comb.lightgray=染色蜂窝（淡灰）
 extrabees.item.comb.nickel=镍蜂窝
-extrabees.item.comb.glowstone=荧石蜂窝
+extrabees.item.comb.glowstone=萤石蜂窝
 extrabees.item.comb.saltpeter=硝石蜂窝
 extrabees.item.comb.compost=堆肥蜂窝
 extrabees.item.comb.sawdust=木屑蜂窝
@@ -127,7 +127,7 @@ extrabees.item.template.corrupted=脏的模版
 extrabees.item.template.name=%s 模版
 extrabees.item.template.empty=空白模版
 
-extrabees.item.database=养蜂人数据库
+extrabees.item.database=养蜂员数据库
 extrabees.item.masterDatabase=养蜂大师数据库
 extrabees.item.database.tooltip=风光尽在盒中
 
@@ -162,7 +162,7 @@ extrabees.item.yelloriumDust=黄铀砂
 extrabees.item.blutoniumDust=蓝钚砂
 extrabees.item.cyaniteDust=蓝晶砂
 
-extrabees.block.apiaristMachine.name=养蜂人机器方块
+extrabees.block.apiaristMachine.name=养蜂员机器方块
 extrabees.block.geneticMachine.name=基因机器方块
 extrabees.block.advGeneticMachine.name=高级基因机器方块
 extrabees.block.ectoplasm.name=胶质网
@@ -299,33 +299,33 @@ extrabees.flowers.fruit.name=水果
 extrabees.flowers.mystical.name=神秘
 
 extrabees.species.arid.name=干旱
-extrabees.species.arid.desc=它们喜欢干旱的大陆，它们的蜂窝几乎都由蜡组成，少有蜂蜜。|养蜂人手册
+extrabees.species.arid.desc=它们喜欢干旱的大陆，它们的蜂窝几乎都由蜡组成，少有蜂蜜。|养蜂员手册
 extrabees.species.barren.name=荒芜
-extrabees.species.barren.desc=这种对沙漠的偏爱，使得它们可以生活在完全没有花的世界。|养蜂人手册
+extrabees.species.barren.desc=这种对沙漠的偏爱，使得它们可以生活在完全没有花的世界。|养蜂员手册
 extrabees.species.desolate.name=荒凉
-extrabees.species.desolate.desc=被诅咒的荒芜之地对于别的生物来说是地狱，是万物的凋零，而这种蜜蜂却能在这种环境里生生不息。|养蜂人手册
+extrabees.species.desolate.desc=被诅咒的荒芜之地对于别的生物来说是地狱，是万物的凋零，而这种蜜蜂却能在这种环境里生生不息。|养蜂员手册
 extrabees.species.gnawing.name=痛苦
 extrabees.species.rotten.name=腐烂
-extrabees.species.rotten.desc=这些蜜蜂对死去的动物的腐肉有种不寻常的兴趣，它们甚至会在蜂巢里储存腐肉。它们的气味也会吸引一些比较难闻的生物（僵尸）。|养蜂人手册
+extrabees.species.rotten.desc=这些蜜蜂对死去的动物的腐肉有种不寻常的兴趣，它们甚至会在蜂巢里储存腐肉。它们的气味也会吸引一些比较难闻的生物（僵尸）。|养蜂员手册
 extrabees.species.bone.name=骷髅
-extrabees.species.bone.desc=因为在野外它们很难保卫它们的家，所以它们吸引了其他的生物（骷髅）来保卫它们的蜂房。|养蜂人手册
+extrabees.species.bone.desc=因为在野外它们很难保卫它们的家，所以它们吸引了其他的生物（骷髅）来保卫它们的蜂房。|养蜂员手册
 extrabees.species.creeper.name=爬行者
-extrabees.species.creeper.desc=你不是很确定你会不会听到它们发出爆炸声。|Binnie，养蜂人
+extrabees.species.creeper.desc=你不是很确定你会不会听到它们发出爆炸声。|Binnie，养蜂员
 extrabees.species.decomposing.name=分解
 extrabees.species.rock.name=石头
-extrabees.species.rock.desc=如果只有我能发现这些旋转的蜜蜂的话，我或许会听到一些美妙的音乐（摇滚乐）。|神秘的养蜂人
+extrabees.species.rock.desc=如果只有我能发现这些旋转的蜜蜂的话，我或许会听到一些美妙的音乐（摇滚乐）。|神秘的养蜂员
 extrabees.species.stone.name=忍耐
-extrabees.species.stone.desc=它们的蜂巢一部分以石头打造，并且消耗的蜡也比以往少。|养蜂人手册
+extrabees.species.stone.desc=它们的蜂巢一部分以石头打造，并且消耗的蜡也比以往少。|养蜂员手册
 extrabees.species.granite.name=坚毅
-extrabees.species.granite.desc=获得了于岩石中打洞的能力后，它们和隐藏于石头之中的矿物质有了令人惊异的密切关系。|养蜂人手册
+extrabees.species.granite.desc=获得了于岩石中打洞的能力后，它们和隐藏于石头之中的矿物质有了令人惊异的密切关系。|养蜂员手册
 extrabees.species.mineral.name=弹性
-extrabees.species.mineral.desc=起源于岩缝中的蜜蜂，它们的后代已经开始进化出以矿物质作为食粮的基因。|养蜂人手册
+extrabees.species.mineral.desc=起源于岩缝中的蜜蜂，它们的后代已经开始进化出以矿物质作为食粮的基因。|养蜂员手册
 extrabees.species.copper.name=铜绿
-extrabees.species.copper.desc=它们因啃咬墙壁中的铜线缆造成的供电问题而声名狼藉。|养蜂人手册
+extrabees.species.copper.desc=它们因啃咬墙壁中的铜线缆造成的供电问题而声名狼藉。|养蜂员手册
 extrabees.species.tin.name=锡灰
-extrabees.species.tin.desc=它们的身体被金属所覆盖，它们还用这种金属打造它们的蜂巢。|养蜂人手册
+extrabees.species.tin.desc=它们的身体被金属所覆盖，它们还用这种金属打造它们的蜂巢。|养蜂员手册
 extrabees.species.iron.name=铁锈
-extrabees.species.iron.desc=哦，锈掉的蜜蜂诶。我是不是要去打针破伤风疫苗？|Jadedcat，养蜂人
+extrabees.species.iron.desc=哦，锈掉的蜜蜂诶。我是不是要去打针破伤风疫苗？|Jadedcat，养蜂员
 extrabees.species.lead.name=铅质
 extrabees.species.lead.desc=“用它应该很容易实现炼金术！”|Pahimar，炼金术士
 extrabees.species.zinc.name=镀锌
@@ -338,7 +338,7 @@ extrabees.species.gold.name=金闪
 extrabees.species.silver.name=银辉
 extrabees.species.electrum.name=琥珀金
 extrabees.species.platinum.name=铂金
-extrabees.species.platinum.desc=喔喔，看这个闪光的蜜蜂。|Jadedcat，养蜂人
+extrabees.species.platinum.desc=喔喔，看这个闪光的蜜蜂。|Jadedcat，养蜂员
 extrabees.species.lapis.name=青金石
 extrabees.species.sodalite.name=方钠
 extrabees.species.pyrite.name=黄铁
@@ -346,12 +346,12 @@ extrabees.species.bauxite.name=铝土
 extrabees.species.cinnabar.name=朱砂
 extrabees.species.sphalerite.name=闪锌
 extrabees.species.emerald.name=绿宝石
-extrabees.species.emerald.desc=看这个蜜蜂！它甚至亮瞎了我的眼睛！|Jadedcat，养蜂人
+extrabees.species.emerald.desc=看这个蜜蜂！它甚至亮瞎了我的眼睛！|Jadedcat，养蜂员
 extrabees.species.ruby.name=红宝石
 extrabees.species.sapphire.name=蓝宝石
 extrabees.species.olivine.name=橄榄石
 extrabees.species.diamond.name=钻石
-extrabees.species.diamond.desc=我的天，这绝对是我见过的最闪亮的蜜蜂！|Jadedcat，养蜂人
+extrabees.species.diamond.desc=我的天，这绝对是我见过的最闪亮的蜜蜂！|Jadedcat，养蜂员
 extrabees.species.unstable.name=不稳
 extrabees.species.nuclear.name=核能
 extrabees.species.radioactive.name=辐射
@@ -379,7 +379,7 @@ extrabees.species.sugar.name=含糖
 extrabees.species.ripening.name=成熟
 extrabees.species.fruit.name=水果
 extrabees.species.alcohol.name=发酵
-extrabees.species.alcohol.desc=回家吧蜜蜂们，你们早喝多了。|Jadedcat， 养蜂人
+extrabees.species.alcohol.desc=回家吧蜜蜂们，你们早喝多了。|Jadedcat， 养蜂员
 extrabees.species.farm.name=农庄
 extrabees.species.milk.name=牛奶
 extrabees.species.milk.desc=“哞哞。嗯…… 我是说，Bzzz。”|一只困惑的蜜蜂
@@ -391,11 +391,11 @@ extrabees.species.swamp.name=潮湿
 extrabees.species.boggy.name=泥淖
 extrabees.species.fungal.name=菌类
 extrabees.species.basalt.name=激怒
-extrabees.species.basalt.desc=它们的祖先到达下界的方式仍不得而知，但下界早已使得它们变得富有攻击性。|养蜂人手册
+extrabees.species.basalt.desc=它们的祖先到达下界的方式仍不得而知，但下界早已使得它们变得富有攻击性。|养蜂员手册
 extrabees.species.tempered.name=愤怒
-extrabees.species.tempered.desc=一次不寻常的突变激活了这只蜜蜂身上更高级别的愤怒的隐性基因。|养蜂人手册
+extrabees.species.tempered.desc=一次不寻常的突变激活了这只蜜蜂身上更高级别的愤怒的隐性基因。|养蜂员手册
 extrabees.species.volcanic.name=火山
-extrabees.species.volcanic.desc=在进化的历程中，它们似乎在什么地方获得了烈焰人的特征。|养蜂人手册
+extrabees.species.volcanic.desc=在进化的历程中，它们似乎在什么地方获得了烈焰人的特征。|养蜂员手册
 extrabees.species.malicious.name=恶意
 extrabees.species.infectious.name=传染
 extrabees.species.virulent.name=剧毒
@@ -406,24 +406,24 @@ extrabees.species.corrosive.name=腐蚀
 extrabees.species.caustic.name=苛性
 extrabees.species.acidic.name=酸化
 extrabees.species.excited.name=激动
-extrabees.species.excited.desc=红石，作为它们额外的能量源，而存在。|养蜂人手册
+extrabees.species.excited.desc=红石，作为它们额外的能量源，而存在。|养蜂员手册
 extrabees.species.energetic.name=活力十足
-extrabees.species.energetic.desc=我的天，搞什么鬼！房子失火了！房子失火了！|Generikb，恐慌的养蜂人
+extrabees.species.energetic.desc=我的天，搞什么鬼！房子失火了！房子失火了！|Generikb，恐慌的养蜂员
 extrabees.species.ecstatic.name=狂喜
-extrabees.species.ecstatic.desc=在从红石里汲取了过量的电力后，它们可以产生充满了能量的电弧。请务必做好防范措施，或许一根避雷针就好。|养蜂人手册
+extrabees.species.ecstatic.desc=在从红石里汲取了过量的电力后，它们可以产生充满了能量的电弧。请务必做好防范措施，或许一根避雷针就好。|养蜂员手册
 extrabees.species.artic.name=冻结
 extrabees.species.freezing.name=冰封
 extrabees.species.shadow.name=阴影
 extrabees.species.darkened.name=黑暗
 extrabees.species.abyss.name=深渊
 extrabees.species.red.name=红色
-extrabees.species.red.desc=不要被它们蜇了，否则你眼前将尽是红色的世界。|养蜂人手册
+extrabees.species.red.desc=不要被它们蜇了，否则你眼前将尽是红色的世界。|养蜂员手册
 extrabees.species.yellow.name=黄色
-extrabees.species.yellow.desc=它们正尝试用蜂蜜来染出你闪光的新一天。|养蜂人手册
+extrabees.species.yellow.desc=它们正尝试用蜂蜜来染出你闪光的新一天。|养蜂员手册
 extrabees.species.blue.name=蓝色
-extrabees.species.blue.desc=“加油吧我的蜜蜂。你看上去开始有点泛蓝了。”|神秘的养蜂人
+extrabees.species.blue.desc=“加油吧我的蜜蜂。你看上去开始有点泛蓝了。”|神秘的养蜂员
 extrabees.species.green.name=绿色
-extrabees.species.green.desc=或许这是一种对于保护色的尝试，然而这些蜜蜂已经开始生产颜色接近树叶或草的颜色的蜂巢了。|养蜂人手册
+extrabees.species.green.desc=或许这是一种对于保护色的尝试，然而这些蜜蜂已经开始生产颜色接近树叶或草的颜色的蜂巢了。|养蜂员手册
 extrabees.species.black.name=黑色
 extrabees.species.white.name=白色
 extrabees.species.brown.name=棕色
@@ -439,6 +439,8 @@ extrabees.species.lightgray.name=淡灰
 extrabees.species.celebratory.name=普天同庆
 extrabees.species.jaded.name=翡翠
 extrabees.species.jaded.desc=我培养出了所有蜜蜂，最后却只得到了点带血色的紫色染料！|Jaded，被 Sengir 选中之人
+extrabees.species.chad.name=纸屑
+extrabees.species.chad.desc=GTNH蜜蜂：最好的东西.
 extrabees.species.glowstone.name=怒视
 extrabees.species.hazardous.name=冒险
 extrabees.species.nickel.name=含镍
@@ -513,4 +515,4 @@ extrabees.gui.database.tab.species.further=次代突变
 
 extrabees.gui.database.tab.branches.overview=概述
 extrabees.gui.database.tab.branches.species=种
-extrabees.gui.database.tab.breeder=杂交路线
+extrabees.gui.database.tab.breeder=杂交路线

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

@@ -158,12 +158,12 @@ extratrees.block.tooltip.twoMaterials=%s - %s
 < %1$s is name of wood used for door >
 extratrees.block.door.name=%1$s木门
 
-< %1$s is name of wood used for door， %2$s is type of door >
+< %1$s is name of wood used for door, %2$s is type of door >
 extratrees.block.door.name.adv=%1$s%2$s木门
 extratrees.block.door.type.standard=
-extratrees.block.door.type.solid=Solid
-extratrees.block.door.type.double=Split
-extratrees.block.door.type.full=Full
+extratrees.block.door.type.solid=坚固
+extratrees.block.door.type.double=分离
+extratrees.block.door.type.full=完整
 
 < %1$s is name of the wood>
 extratrees.block.plank.name=%1$s木板
@@ -173,7 +173,7 @@ extratrees.block.woodstairs.name=%1$s楼梯
 extratrees.block.woodfence.name=%1$s栅栏
 extratrees.block.woodgate.name=%1$s栅栏门
 
-< %1$s is the adjective for the fence type， %2$s is the name of the wood >
+< %1$s is the adjective for the fence type, %2$s is the name of the wood >
 extratrees.block.multifence.name=%2$s %1$s 门
 < %3$s is the name of the second wood >
 extratrees.block.multifence.name2=%2$s %1$s & $3$s 门
@@ -269,7 +269,7 @@ extratrees.species.raspberry.name=树莓
 extratrees.species.blueberry.name=蓝莓
 extratrees.species.cranberry.name=蔓越莓
 extratrees.species.juniper.name=杜松子
-extratrees.species.gooseberry.name=鹅莓
+extratrees.species.gooseberry.name=醋栗
 extratrees.species.goldenraspberry.name=金树莓
 extratrees.species.cinnamon.name=肉桂
 extratrees.species.coconut.name=椰子
@@ -359,6 +359,7 @@ for.extratrees.item.food.elderberry=接骨木浆果
 for.extratrees.item.food.olive=橄榄
 for.extratrees.item.food.gingkonut=白果
 for.extratrees.item.food.coffee=咖啡
+for.extratrees.item.food.osangeosange=桑橙
 for.extratrees.item.food.osangeorange=桑橙
 for.extratrees.item.food.clove=丁香
 for.extratrees.item.food.papayimar=Pahimar牌木瓜
@@ -369,7 +370,7 @@ for.extratrees.item.food.raspberry=树莓
 for.extratrees.item.food.blueberry=蓝莓
 for.extratrees.item.food.cranberry=蔓越莓
 for.extratrees.item.food.juniper=杜松子
-for.extratrees.item.food.gooseberry=鹅莓
+for.extratrees.item.food.gooseberry=醋栗
 for.extratrees.item.food.goldenraspberry=金树莓
 for.extratrees.item.food.coconut=椰子
 for.extratrees.item.food.cashew=腰果
@@ -434,3 +435,6 @@ extratrees.gui.database.tab.butterfly.breeder=杂交路线
 
 extratrees.gui.database.log=原木
 extratrees.gui.database.leaves=树叶
+
+
+binniecore.beemodifier.genetic_decay=基因衰变

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

@@ -50,7 +50,7 @@ genetics.sequence.fully=Fully Sequenced
 genetics.sequence.partially=Partially Sequenced (%d%%)
 
 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.
+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
 genetics.machine.isolator.error.noRoom=No room for DNA sequences
 genetics.machine.isolator.error.noVials=No empty sequencer vials
@@ -122,7 +122,7 @@ genetics.machine.incubator.error.noLiquid=Not enough incubation liquid
 genetics.machine.incubator.error.noRoom=No room for output
 
 genetics.machine.labMachine.acclimatiser=Acclimatiser
-genetics.machine.labMachine.acclimatiser.info=The Acclimatiser uses acclimatizing items to adjust the temperature and humidity tolerance of individuals.
+genetics.machine.labMachine.acclimatiser.info=The Acclimatiser uses acclimatizing items to adjust the temperature and humidity tolerance of individuals. This process has only a small chance to succeed.
 genetics.machine.acclimatiser.acclimatizingItems=Acclimatizing Items
 genetics.machine.acclimatiser.error.noIndividual=No Individual to Acclimatise
 genetics.machine.acclimatiser.error.noAcclimatizingItems=No Acclimatising Items

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

@@ -50,7 +50,7 @@ genetics.sequence.fully=已测序
 genetics.sequence.partially=测序 %d%%
 
 genetics.machine.machine.isolator=基因分离器
-genetics.machine.machine.isolator.info=基因分离器将会从蜜蜂、树苗或者其它的独立个体中随机提取基因片段，并复制到空白序列中。此过程需要乙醇作为溶剂，还需要酶来切断DNA。未测序的序列可以在基因同化器中扩增，并在测序仪中进行测序。
+genetics.machine.machine.isolator.info=基因分离器将会从蜜蜂、树苗或者其它的独立个体中随机提取基因片段，并复制到空白序列中。此过程需要乙醇作为溶剂，还需要酶来切断DNA。未测序的序列可以在基因同化器中扩增，并在测序仪中进行测序。此过程有小概率摧毁该个体。
 genetics.machine.isolator.error.noIndividual=没有个体样本
 genetics.machine.isolator.error.noRoom=没有空间
 genetics.machine.isolator.error.noVials=没有空白序列
@@ -105,7 +105,7 @@ genetics.machine.genepool.error.insufficientEnzyme=酶不足
 genetics.machine.labMachine.labMachine=实验台
 
 genetics.machine.labMachine.analyser=分析仪
-genetics.machine.labMachine.analyser.info=分析仪可分析可增殖个体和 DNA 序列，并确定当前的基因类型。此过程需要 DNA 染料，可由紫色染料和荧石粉合成得到。
+genetics.machine.labMachine.analyser.info=分析仪可分析可增殖个体和 DNA 序列，并确定当前的基因类型。此过程需要 DNA 染料，可由紫色染料和萤石粉合成得到。
 genetics.machine.analyser.dnaDye=DNA 染料
 genetics.machine.analyser.unanalysedItem=未经分析的物品
 genetics.machine.analyser.error.alreadyAnalysed.title=已经过分析
@@ -122,7 +122,7 @@ genetics.machine.incubator.error.noLiquid=液体不足
 genetics.machine.incubator.error.noRoom=输出槽已满
 
 genetics.machine.labMachine.acclimatiser=适应性调整器
-genetics.machine.labMachine.acclimatiser.info=适应性调整器使用适应性调整物品来调整个体的温度和湿度适应性。
+genetics.machine.labMachine.acclimatiser.info=适应性调整器使用适应性调整物品，来调整个体的温度和湿度适应性。此过程只有小概率成功。
 genetics.machine.acclimatiser.acclimatizingItems=适应性调整物品
 genetics.machine.acclimatiser.error.noIndividual=没有可供调整适应性的个体
 genetics.machine.acclimatiser.error.noAcclimatizingItems=没有适应性调整物品
@@ -266,3 +266,12 @@ genetics.gui.analyst.wood.flammable=可燃
 genetics.gui.analyst.wood.logs=原木
 genetics.gui.analyst.wood.products=精加工产物
 genetics.gui.analyst.wood.noFruits=这种树不结果实
+
+genetics.nei.tip.loss=损耗:
+genetics.nei.tip.noConsume=不被消耗
+genetics.nei.tip.effect=效果: %s
+genetics.nei.tip.temperature=温度
+genetics.nei.tip.humidity=湿度
+genetics.nei.tip.processSpeed=%dx 处理速度
+genetics.nei.tip.rf=%dx 处理速度
+genetics.nei.tip.databaseDesc=打开数据库并拿起一个空血清瓶. 点击已测序的血清以应用.