diff --git a/build.gradle b/build.gradle index 6d1d572..57d8d1f 100644 --- a/build.gradle +++ b/build.gradle @@ -18,7 +18,7 @@ buildscript { apply plugin: 'forge' apply plugin: 'scala' -version = "0.9.6" +version = "0.9.7" ext.bdlibver = "0.9.4.12" ext.versuffix = "mc164" diff --git a/resources/assets/gendustry/gendustry-tuning.cfg b/resources/assets/gendustry/gendustry-tuning.cfg index f43f08f..eb7b6d2 100644 --- a/resources/assets/gendustry/gendustry-tuning.cfg +++ b/resources/assets/gendustry/gendustry-tuning.cfg @@ -66,6 +66,21 @@ cfg Machines { // Has no effect if only secret mutations are present } + cfg MutatronAdv { + Enabled = Yes + MaxReceivedEnergy = 500 + PowerUseRate = 0.00125 + MjPerItem = 20000 + MaxStoredEnergy = 160000 + ActivationEnergy = 20 + + TankSize = 10000 // Output tank size in milibuckets + MutagenPerItem = 1000 // Mutagen use per run, in milibuckets + LabwareConsumeChance = 100 // Chance that the Genetic Labware will be consumed, 0-100 + DegradeChanceNatural = 0 // Chance of natural princesses to become artificial when mutating, 0-100 + DeathChanceArtificial = 10 // Chance of artificial princesses to be killed when mutating, 0-100 + } + cfg Sampler { Enabled = Yes MaxReceivedEnergy = 500 diff --git a/resources/assets/gendustry/lang/en_US.lang b/resources/assets/gendustry/lang/en_US.lang index 6cc3571..6caf56f 100644 --- a/resources/assets/gendustry/lang/en_US.lang +++ b/resources/assets/gendustry/lang/en_US.lang @@ -1,6 +1,7 @@ tile.gendustry.mutagen.name=Mutagen tile.gendustry.mutagen.producer.name=Mutagen Producer tile.gendustry.mutatron.name=Mutatron +tile.gendustry.mutatron.adv.name=Advanced Mutatron tile.gendustry.apiary.name=Industrial Apiary tile.gendustry.imprinter.name=Genetic Imprinter tile.gendustry.sampler.name=Genetic Sampler @@ -41,6 +42,7 @@ fluid.gendustry.mutagen=Mutagen gendustry.label.template.crafting=Genetic Samples can be added to a Template. Combine them in any crafting table. Multiple samples can be added at once. gendustry.label.charges=Charges: %s +gendustry.label.select=Select: gendustry.label.breeding=Breeding gendustry.label.working=Working diff --git a/resources/assets/gendustry/textures/blocks/mutatron_adv/bottom.png b/resources/assets/gendustry/textures/blocks/mutatron_adv/bottom.png new file mode 100644 index 0000000..e90d029 Binary files /dev/null and b/resources/assets/gendustry/textures/blocks/mutatron_adv/bottom.png differ diff --git a/resources/assets/gendustry/textures/blocks/mutatron_adv/mutatron_adv.psd b/resources/assets/gendustry/textures/blocks/mutatron_adv/mutatron_adv.psd new file mode 100644 index 0000000..84bb92a Binary files /dev/null and b/resources/assets/gendustry/textures/blocks/mutatron_adv/mutatron_adv.psd differ diff --git a/resources/assets/gendustry/textures/blocks/mutatron_adv/side.png b/resources/assets/gendustry/textures/blocks/mutatron_adv/side.png new file mode 100644 index 0000000..980726e Binary files /dev/null and b/resources/assets/gendustry/textures/blocks/mutatron_adv/side.png differ diff --git a/resources/assets/gendustry/textures/blocks/mutatron_adv/top.png b/resources/assets/gendustry/textures/blocks/mutatron_adv/top.png new file mode 100644 index 0000000..211c5ab Binary files /dev/null and b/resources/assets/gendustry/textures/blocks/mutatron_adv/top.png differ diff --git a/resources/assets/gendustry/textures/gui/mutatron_adv.png b/resources/assets/gendustry/textures/gui/mutatron_adv.png new file mode 100644 index 0000000..0f49abc Binary files /dev/null and b/resources/assets/gendustry/textures/gui/mutatron_adv.png differ diff --git a/resources/assets/gendustry/textures/gui/mutatron_adv.psd b/resources/assets/gendustry/textures/gui/mutatron_adv.psd new file mode 100644 index 0000000..b8f6925 Binary files /dev/null and b/resources/assets/gendustry/textures/gui/mutatron_adv.psd differ diff --git a/resources/assets/gendustry/textures/gui/widgets.png b/resources/assets/gendustry/textures/gui/widgets.png index 8b7ffaa..d297ba3 100644 Binary files a/resources/assets/gendustry/textures/gui/widgets.png and b/resources/assets/gendustry/textures/gui/widgets.png differ diff --git a/resources/assets/gendustry/textures/gui/widgets.psd b/resources/assets/gendustry/textures/gui/widgets.psd index 3a4f404..ed952d9 100644 Binary files a/resources/assets/gendustry/textures/gui/widgets.psd and b/resources/assets/gendustry/textures/gui/widgets.psd differ