Commit for b11

SihenZhang · Aug 19, 2017 · af8e7e4 · af8e7e4
1 parent d1f622e
commit af8e7e4
Show file tree

Hide file tree

Showing 59 changed files with 440 additions and 149 deletions.
diff --git a/CS2_Creator/assets/creator/textures/items/arc_furnace.png b/CS2_Creator/assets/creator/textures/items/arc_furnace.png
diff --git a/CS2_Creator/assets/creator/textures/items/bottling_machine.png b/CS2_Creator/assets/creator/textures/items/bottling_machine.png
diff --git a/CS2_Creator/assets/creator/textures/items/chamberElectrum.png b/CS2_Creator/assets/creator/textures/items/chamberElectrum.png
diff --git a/CS2_Creator/assets/creator/textures/items/chamberElectrumG.png b/CS2_Creator/assets/creator/textures/items/chamberElectrumG.png
diff --git a/CS2_Creator/assets/creator/textures/items/chamberIron.png b/CS2_Creator/assets/creator/textures/items/chamberIron.png
diff --git a/CS2_Creator/assets/creator/textures/items/chamberIronG.png b/CS2_Creator/assets/creator/textures/items/chamberIronG.png
diff --git a/CS2_Creator/assets/creator/textures/items/chamberOsmium.png b/CS2_Creator/assets/creator/textures/items/chamberOsmium.png
diff --git a/CS2_Creator/assets/creator/textures/items/chamberOsmiumG.png b/CS2_Creator/assets/creator/textures/items/chamberOsmiumG.png
diff --git a/CS2_Creator/assets/creator/textures/items/crusher.png b/CS2_Creator/assets/creator/textures/items/crusher.png
diff --git a/CS2_Creator/assets/creator/textures/items/diesel_generator.png b/CS2_Creator/assets/creator/textures/items/diesel_generator.png
diff --git a/...reator/textures/items/chamberOsmiumEH.png → ...sets/creator/textures/items/excavator.png b/...reator/textures/items/chamberOsmiumEH.png → ...sets/creator/textures/items/excavator.png
diff --git a/CS2_Creator/assets/creator/textures/items/fermenter.png b/CS2_Creator/assets/creator/textures/items/fermenter.png
diff --git a/...ssets/creator/textures/items/zincDust.png → ...textures/items/improved_blast_furnace.png b/...ssets/creator/textures/items/zincDust.png → ...textures/items/improved_blast_furnace.png
diff --git a/...ator/textures/items/chamberElectrumEH.png → ...or/textures/items/industrial_squeezer.png b/...ator/textures/items/chamberElectrumEH.png → ...or/textures/items/industrial_squeezer.png
diff --git a/...s/creator/textures/items/zincDustTiny.png → ...ts/creator/textures/items/metal_press.png b/...s/creator/textures/items/zincDustTiny.png → ...ts/creator/textures/items/metal_press.png
diff --git a/.../creator/textures/items/zincDustSmall.png → ...ssets/creator/textures/items/refinery.png b/.../creator/textures/items/zincDustSmall.png → ...ssets/creator/textures/items/refinery.png
diff --git a/CS2_Creator/items/chamberElectrum.js b/CS2_Creator/items/chamberElectrum.js
diff --git a/CS2_Creator/items/chamberElectrumEH.js b/CS2_Creator/items/chamberElectrumEH.js
diff --git a/CS2_Creator/items/chamberElectrumG.js b/CS2_Creator/items/chamberElectrumG.js
diff --git a/CS2_Creator/items/chamberIron.js b/CS2_Creator/items/chamberIron.js
diff --git a/CS2_Creator/items/chamberIronG.js b/CS2_Creator/items/chamberIronG.js
diff --git a/CS2_Creator/items/chamberOsmium.js b/CS2_Creator/items/chamberOsmium.js
diff --git a/CS2_Creator/items/chamberOsmiumEH.js b/CS2_Creator/items/chamberOsmiumEH.js
diff --git a/CS2_Creator/items/chamberOsmiumG.js b/CS2_Creator/items/chamberOsmiumG.js
diff --git a/CS2_Creator/items/enderDiamond.js b/CS2_Creator/items/enderDiamond.js
diff --git a/CS2_Creator/items/ieMachines.js b/CS2_Creator/items/ieMachines.js
@@ -0,0 +1,22 @@
+name = "ieMachines";
+maxStack = 64;
+
+textureFile[0] = "metal_press.png";
+
+textureFile[1] = "improved_blast_furnace.png";
+
+textureFile[2] = "crusher.png";
+
+textureFile[3] = "bottling_machine.png";
+
+textureFile[4] = "industrial_squeezer.png";
+
+textureFile[5] = "fermenter.png";
+
+textureFile[6] = "refinery.png";
+
+textureFile[7] = "arc_furnace.png";
+
+textureFile[8] = "excavator.png";
+
+textureFile[9] = "diesel_generator.png";
diff --git a/CS2_Creator/items/zincDust.js b/CS2_Creator/items/zincDust.js
diff --git a/CS2_Creator/items/zincDustSmall.js b/CS2_Creator/items/zincDustSmall.js
diff --git a/CS2_Creator/items/zincDustTiny.js b/CS2_Creator/items/zincDustTiny.js
diff --git a/CS2_Creator/mod.js b/CS2_Creator/mod.js
@@ -123,9 +123,6 @@ mod.addItem("osmiumDustTiny.js", "normal");
 mod.addItem("tungstenDust.js", "normal");
 mod.addItem("tungstenDustSmall.js", "normal");
 mod.addItem("tungstenDustTiny.js", "normal");
-mod.addItem("zincDust.js", "normal");
-mod.addItem("zincDustSmall.js", "normal");
-mod.addItem("zincDustTiny.js", "normal");
 mod.addItem("uranium_dioxide.js", "normal");
 mod.addItem("uranium_halide.js", "normal");
 
@@ -192,6 +189,8 @@ mod.addItem("symXun.js","normal");
 mod.addItem("symQian.js","normal"); 
 mod.addItem("symKun.js","normal"); 
 
+mod.addItem("ieMachines.js","normal"); 
+
 //blocks
 mod.addBlock("eye.js","flat");
 mod.addBlock("qian.js","flat");

diff --git a/Prunoideae/data.dat b/Prunoideae/data.dat
diff --git a/Prunoideae/data_dump.txt b/Prunoideae/data_dump.txt
diff --git a/config/IguanaTinkerTweaks/restrictions.cfg b/config/IguanaTinkerTweaks/restrictions.cfg
@@ -95,8 +95,8 @@ toolparts {
 
     # Prevents the creation of listed Material-Tool combinations.
     # The format is <materialname>:<partname>
-    # materialnames are: Wood, Platinum, Stone, Electrum, Iron, Flint, Cactus, Bone, Obsidian, Netherrack, Slime, Paper, Cobalt, Ardite, Refined Glowstone, Manyullyn, Osmium, Copper, Pokefennium, Bronze, Fairy, Alumite, Certus Quartz, Steel, Ender Amethyst, BlueSlime, PigIron, Thaumium, Amethyst, Peridot, Ruby, Sapphire, String, Dark Steel, Void Metal, Red Aurum, Glue, Yellorium, Cyanite, Blutonium, Ludicrite, Bedrockium, Onion, unstableIngot, Bedrockium, MagicWood, Enderium, Signalum, Lumium, Constantan, avaritia_neutronium, avaritia_infinitymetal, Invar, Nickel, Mithril, Lead, Silver
-    # partnames are: scythe, pickaxe, rod, largeguard, sign, shovel, swordblade, binding, fullguard, arrowhead, crossbowlimb, axe, bowlimb, excavator, hammerhead, mediumguard, frypan, crossbar, toughbinding, crossbowbody, broadaxe, chisel, knifeblade, largerod, shuriken, largeplate, largeblade, 
+    # materialnames are: Wood, Platinum, Stone, Electrum, Iron, Flint, Cactus, Bone, Obsidian, Netherrack, Slime, Paper, Cobalt, Ardite, Refined Glowstone, Manyullyn, Osmium, Copper, Pokefennium, Bronze, Fairy, Alumite, Certus Quartz, Steel, Ender Amethyst, BlueSlime, PigIron, Thaumium, Amethyst, Peridot, Ruby, Sapphire, String, Dark Steel, Void Metal, Red Aurum, Draconium, Awakened Draconium, Glue, Yellorium, Cyanite, Blutonium, Ludicrite, Bedrockium, Onion, unstableIngot, Bedrockium, MagicWood, Enderium, Signalum, Lumium, Constantan, avaritia_neutronium, avaritia_infinitymetal, Invar, Nickel, Mithril, Lead, Silver
+    # partnames are: scythe, pickaxe, rod, largeguard, sign, shovel, binding, swordblade, fullguard, arrowhead, crossbowlimb, axe, bowlimb, excavator, hammerhead, mediumguard, crossbar, frypan, toughbinding, crossbowbody, broadaxe, chisel, knifeblade, largerod, shuriken, largeplate, largeblade, 
     #  [default: ]
     S:restricted <
      >

diff --git a/config/ImmersiveEngineering.cfg b/config/ImmersiveEngineering.cfg
@@ -201,7 +201,7 @@ machines {
     I:"Arc Furnace: Graphite Electrodes"=72000
 
     # Set this to false to disable the Arc Furnace's recycling of armors and tools
-    B:"Arc Furnace: Recycling"=true
+    B:"Arc Furnace: Recycling"=false
 
     # The RF the Assembler will consume to craft an item from a recipe
     I:"Assembler: Consumed"=80
@@ -255,7 +255,7 @@ machines {
     I:"Diesel Generator: Output"=2048
 
     # The base RF that is output by the dynamo. This will be modified by the rotation modifier of the attached water- or windmill
-    D:"Dynamo: Output"=0.25
+    D:"Dynamo: Output"=0.625
 
     # The chance that the Excavator will not dig up an ore with the currently downward-facing bucket.
     D:"Excavator: Chance"=0.05

diff --git a/config/PackGuard.cfg b/config/PackGuard.cfg
@@ -121,15 +121,15 @@ mods {
         BigReactors
         0.4.3A
         BinnieCore
-        2.0.20-2
+        2.0.21-6
         Botany
-        2.0.20-2
+        2.0.21-6
         ExtraTrees
-        2.0.20-2
+        2.0.21-6
         Genetics
-        2.0.20-2
+        2.0.21-6
         ExtraBees
-        2.0.20-2
+        2.0.21-6
         BuildCraft|Core
         7.1.22
         BuildCraft|Transport
@@ -169,7 +169,7 @@ mods {
         defaultworldgenerator
         0.1-b13
         enderclay
-        1.0.6
+        1.0.9
         endercore
         1.7.10-0.2.0.39_beta
         EnderStorage
@@ -200,6 +200,18 @@ mods {
         1.7.10-1.8.8.build988
         ExtraTiC
         1.4.6
+        factorization.notify
+        1.0
+        factorization.dimensionalSlice
+        0.8.108
+        factorization
+        0.8.108
+        factorization.misc
+        0.8.108
+        fz.scrap
+        0.8.108
+        factorization.truth
+        0.8.108
         FTBL
         1.0.18.2
         FTBU

diff --git a/config/aobd.cfg b/config/aobd.cfg
@@ -139,6 +139,70 @@ Custom {
 }
 
 
+Draconium {
+    B:"Disable All"=false
+    B:Eln=true
+    B:EnderIO=true
+    B:HydCraft=true
+    B:IC2=true
+    B:ImmersiveEngineering=true
+    B:Magneticraft=true
+    B:Mariculture=true
+    B:Mekanism=true
+    B:NetherOres=true
+    B:Railcraft=true
+    B:Steamcraft=true
+    B:TConstruct=true
+    B:Thaumcraft=true
+    B:ThermalExpansion=true
+    B:appliedenergistics2=true
+    B:aura=true
+    B:bcadditions=true
+    S:colour=0xb39cca
+    D:energy=1.0
+    B:eng_toolbox=true
+    B:exnihilo=true
+    S:extra=Draconium
+    B:factorization=true
+    B:ganysnether=true
+    B:modularsystems=true
+    B:randomadditions=true
+    B:simpleoregrinder=true
+}
+
+
+FzDarkIron {
+    B:"Disable All"=false
+    B:Eln=true
+    B:EnderIO=true
+    B:HydCraft=true
+    B:IC2=true
+    B:ImmersiveEngineering=true
+    B:Magneticraft=true
+    B:Mariculture=true
+    B:Mekanism=true
+    B:NetherOres=true
+    B:Railcraft=true
+    B:Steamcraft=true
+    B:TConstruct=true
+    B:Thaumcraft=true
+    B:ThermalExpansion=true
+    B:appliedenergistics2=true
+    B:aura=true
+    B:bcadditions=true
+    S:colour=0x3f0076
+    D:energy=3.0
+    B:eng_toolbox=true
+    B:exnihilo=true
+    S:extra=Silver
+    B:factorization=true
+    B:ganysnether=true
+    B:modularsystems=true
+    B:randomadditions=true
+    B:simpleoregrinder=true
+}
+
+
 Gold {
     B:"Disable All"=false
     B:Eln=true
@@ -648,7 +712,7 @@ Yellorium {
 
 
 Zinc {
-    B:"Disable All"=false
+    B:"Disable All"=true
     B:Eln=true
     B:EnderIO=true
     B:HydCraft=true

diff --git a/config/enderclay.cfg b/config/enderclay.cfg
@@ -1,6 +1,12 @@
 # Configuration file
 
 general {
+    # ritualBlock [default: blockDiamond]
+    S:ritualBlock1=blockGreen
+
+    # ritualBlock [default: blockGold]
+    S:ritualBlock2=blockRed
+
     # If this is enable, lassos nbt won't change when you interact with lasso in creative mode
     B:useNewFeature=false
 }