Merge branch 'develop'

EnigmaticaModpacks · Oct 16, 2022 · f084e9e · f084e9e
2 parents bff2001 + 8d8d137
commit f084e9e
Show file tree

Hide file tree

Showing 150 changed files with 11,186 additions and 27,401 deletions.
diff --git a/...omputersMod-1.7.5.192-lua52-native.64.dll → ...tersMod-1.7.7+5413028-lua52-native.64.dll b/...omputersMod-1.7.5.192-lua52-native.64.dll → ...tersMod-1.7.7+5413028-lua52-native.64.dll
diff --git a/...omputersMod-1.7.5.192-lua53-native.64.dll → ...tersMod-1.7.7+5413028-lua53-native.64.dll b/...omputersMod-1.7.5.192-lua53-native.64.dll → ...tersMod-1.7.7+5413028-lua53-native.64.dll
diff --git a/config/CustomMainMenu/mainmenu.json b/config/CustomMainMenu/mainmenu.json
@@ -4,28 +4,28 @@
         "enigmatica2":
         {
             "image" : "modpack:textures/gui/enigmatica2.png",
-            "posX" : -130,
+            "posX" : -90,
             "posY" : 15,
-            "width" : 400,
-            "height" : 75,
+            "width" : 288,
+            "height" : 54,
             "alignment" : "top_center"
         },
 		"expert":
         {
             "image" : "modpack:textures/gui/expert.png",
-            "posX" : -15,
-            "posY" : 90,
-            "width" : 200,
-            "height" : 40,
+            "posX" : 15,
+            "posY" : 75,
+            "width" : 144,
+            "height" : 29,
             "alignment" : "top_center"
         },
 		"2":
         {
             "image" : "modpack:textures/gui/2.png",
-            "posX" : 265,
-            "posY" : 35,
-            "width" : 50,
-            "height" : 50,
+            "posX" : 200,
+            "posY" : 28,
+            "width" : 36,
+            "height" : 36,
             "alignment" : "top_center"
         },
 

diff --git a/config/FarmingForBlockheads/Market.json b/config/FarmingForBlockheads/Market.json
@@ -79,6 +79,7 @@
     "rustic:blood_orchid": "1*minecraft:emerald",
     "rustic:aloe_vera": "1*minecraft:emerald",
     "rustic:grape_stem": "1*minecraft:emerald",
+    "minecraft:double_plant": "1*minecraft:emerald",
     "thaumcraft:shimmerleaf": "3*minecraft:emerald"
   },
   "defaults amount": {

diff --git a/config/TinkerToolLeveling.cfg b/config/TinkerToolLeveling.cfg
@@ -9,7 +9,6 @@ toolxp {
     # Base XP for each of the listed tools
     baseXpForTool {
         "exnihilocreatio:crook_tconstruct"=200
-        "exnihilocreatio:hammer_tconstruct"=200
         "plustic:katana"=150
         "plustic:laser_gun"=150
         "tcomplement:chisel"=200

diff --git a/config/acronym/base/General.cfg b/config/acronym/base/General.cfg
@@ -0,0 +1,39 @@
+# Configuration file
+
+general {
+    # Config entry for adding other items to count as tools. Format is "modid:item_name:meta" * is for any meta
+    S:"Other Tools" <
+        [immersiveengineering:tool:0
+        thermalfoundation:wrench:*
+        techreborn:wrench:*
+        actuallyadditions:item_laser_wrench:*
+        hammercore:wrench:*
+        hammercore:iwrench:*
+        mekanism:configurator:*
+        calculator:wrench:*
+        ic2:wrench:*
+        appliedenergistics2:certus_quartz_wrench:*
+        appliedenergistics2:nether_quartz_wrench:*
+        enderio:item_yeta_wrench:*
+        botania:twigwand:*
+        essentials:wrench:*
+        factorytech:wrench:*]
+     >
+}
+
+
+materials {
+    # List for Prioritizing OreDict returns by modid
+    S:preferredOreDictIds <
+        contenttweaker
+        base
+     >
+}
+
+
+module {
+    B:"JourneyMap enabled"=true
+    B:"Tool enabled"=true
+}
+
+
diff --git a/config/acronym/contenttweaker/General.cfg b/config/acronym/contenttweaker/General.cfg
@@ -0,0 +1,10 @@
+# Configuration file
+
+module {
+    B:"Chickens enabled"=true
+    B:"Materials enabled"=true
+    B:"Tinkers enabled"=true
+    B:"Vanilla CraftTweaker enabled"=true
+}
+
+
diff --git a/config/acronym/material_system.cfg b/config/acronym/material_system.cfg
@@ -0,0 +1,8 @@
+# Configuration file
+
+item {
+    # 0 - All Item Parts on a Single MC Item, 1 - All Item Parts have their own MC Item, > 1 - That many Parts per item
+    I:size=0
+}
+
+
diff --git a/config/acronym/saved/material_parts_contenttweaker-original.json b/config/acronym/saved/material_parts_contenttweaker-original.json
@@ -0,0 +1,3 @@
+{
+  "materialMappings": {}
+}
diff --git a/config/acronym/saved/material_parts_contenttweaker.json b/config/acronym/saved/material_parts_contenttweaker.json
@@ -0,0 +1,3 @@
+{
+  "materialMappings": {}
+}
diff --git a/config/acronym/saved/saved_sub_blocks_contenttweaker-original.json b/config/acronym/saved/saved_sub_blocks_contenttweaker-original.json
@@ -0,0 +1,3 @@
+{
+  "savedSubBlockNames": {}
+}
diff --git a/config/acronym/saved/saved_sub_blocks_contenttweaker.json b/config/acronym/saved/saved_sub_blocks_contenttweaker.json
@@ -0,0 +1,3 @@
+{
+  "savedSubBlockNames": {}
+}
diff --git a/config/actuallyadditions.cfg b/config/actuallyadditions.cfg
@@ -37,7 +37,7 @@
     I:"Leaf Generator Cooldown"=5
 
     # The Leaf Generator's Energy Production in CF/Leaf
-    I:"Leaf Generator Energy Production"=300
+    I:"Leaf Generator Energy Production"=10000
 
     # The energy use of the Atomic Reconstructor's Mining Lens.
     I:"Mining Lens Energy"=60000
@@ -103,7 +103,7 @@ other {
     I:"Booklet Small Font Size"=0
 
     # If true, the Lens of Color will attempt to pull from the oredict instead of only using vanilla dyes.
-    B:"Color Lens Oredict"=false
+    B:"Color Lens Oredict"=true
 
     # The non-Actually Additions items that are used to configure blocks from the mod. The first one is the Redstone Torch used to configure the Redstone Mode, and the second one is the Compass used to configure Laser Relays. If another mod overrides usage of either one of these items, you can change the registry name of the used items (using blocks is not possible) here.
     S:"Configuration Items" <
@@ -144,6 +144,7 @@ other {
         draconicevolution:draconium_ore
         draconicevolution:draconium_ore@1
         draconicevolution:draconium_ore@2
+        bigreactors:oreyellorite
      >
 
     # By default, the mining lens has a set number of ores it can generate. If there is an ore that it should be able to generate, add its OreDictionary name followed by an @ and the weight that it should have (the higher, the more often it will generate), followed by another @ and then an s for it to generate in stone and an n for it to generate in netherrack. For instance: oreCheese@100@s would add cheese ore with a weight of 100 that generates in stone.

diff --git a/config/advRocketry/Centrifuge.xml b/config/advRocketry/Centrifuge.xml
@@ -31,5 +31,4 @@
 	
 	The "useDefault" attribute will prevent loading of recipes if set to "false"
 <!-->
-<Recipes useDefault="true">
-</Recipes>
+<Recipes useDefault="true"/>
diff --git a/config/advRocketry/ChemicalReactor.xml b/config/advRocketry/ChemicalReactor.xml
@@ -21,7 +21,7 @@
 	The "useDefault" attribute will prevent loading of recipes if set to "false"
 <!-->
 <Recipes useDefault="false">
-	<Recipe timeRequired="40" power ="100000">
+	<Recipe timeRequired="40" power="100000">
 		<input>
 			<itemStack>advancedrocketry:carbonscrubbercartridge 1 32767</itemStack>
 		</input>
@@ -30,7 +30,7 @@
 			<itemStack>minecraft:coal 1 1</itemStack>
 		</output>
 	</Recipe>
-	<Recipe timeRequired="100" power ="5000">
+	<Recipe timeRequired="100" power="5000">
 		<input>
 			<itemStack>minecraft:bone</itemStack>
 			<fluidStack>nitrogen 10</fluidStack>
@@ -39,94 +39,102 @@
 			<itemStack>minecraft:dye 5 15</itemStack>
 		</output>
 	</Recipe>
-
 	<!-- EnderIO Liquids -->
-	<Recipe timeRequired="100" power ="30000">
+	<Recipe timeRequired="100" power="30000">
 		<input>
 			<fluidStack>water 32000</fluidStack>
 			<oreDict>itemSkull 8</oreDict>
 			<oreDict>itemPulsatingPowder 2</oreDict>
 			<oreDict>itemEnderCrystalPowder 1</oreDict>
 			<oreDict>itemPrecientPowder 1</oreDict>
 		</input>
-		<output><fluidStack>vapor_of_levity 1000</fluidStack></output>
+		<output>
+			<fluidStack>vapor_of_levity 1000</fluidStack>
+		</output>
 	</Recipe>
-
-	<Recipe timeRequired="40" power ="30000">
+	<Recipe timeRequired="40" power="30000">
 		<input>
 			<fluidStack>water 32000</fluidStack>
 			<oreDict>itemSkull 8</oreDict>
 			<oreDict>itemPulsatingPowder 1</oreDict>
 			<oreDict>itemEnderCrystalPowder 1</oreDict>
 		</input>
-		<output><fluidStack>ender_distillation 1000</fluidStack></output>
+		<output>
+			<fluidStack>ender_distillation 1000</fluidStack>
+		</output>
 	</Recipe>
-
-	<Recipe timeRequired="20" power ="30000">
+	<Recipe timeRequired="20" power="30000">
 		<input>
 			<fluidStack>water 2000</fluidStack>
 			<oreDict>itemSkull 1</oreDict>
 		</input>
-		<output><fluidStack>nutrient_distillation 500</fluidStack></output>
+		<output>
+			<fluidStack>nutrient_distillation 500</fluidStack>
+		</output>
 	</Recipe>
-
 	<!--  -->
-	<Recipe timeRequired="60" power ="30000">
+	<Recipe timeRequired="60" power="30000">
 		<input>
 			<fluidStack>water 8000</fluidStack>
 			<itemStack>minecraft:poisonous_potato 1 0</itemStack>
 			<oreDict>dustRedstone 1</oreDict>
 			<oreDict>dustBlaze 1</oreDict>
 			<itemStack>minecraft:double_plant 1 0</itemStack>
 		</input>
-		<output><fluidStack>liquid_sunshine 2000</fluidStack></output>
+		<output>
+			<fluidStack>liquid_sunshine 2000</fluidStack>
+		</output>
 	</Recipe>
-
-	<Recipe timeRequired="40" power ="30000">
+	<Recipe timeRequired="40" power="30000">
 		<input>
 			<fluidStack>water 8000</fluidStack>
 			<itemStack>minecraft:poisonous_potato 1 0</itemStack>
 			<oreDict>dustRedstone 1</oreDict>
 			<oreDict>dustBlaze 1</oreDict>
 		</input>
-		<output><fluidStack>fire_water 2000</fluidStack></output>
+		<output>
+			<fluidStack>fire_water 2000</fluidStack>
+		</output>
 	</Recipe>
-
-	<Recipe timeRequired="60" power ="30000">
+	<Recipe timeRequired="60" power="30000">
 		<input>
 			<fluidStack>water 8000</fluidStack>
 			<itemStack>minecraft:poisonous_potato 1 0</itemStack>
 			<oreDict>dustRedstone 1</oreDict>
 			<oreDict>gunpowder 1</oreDict>
 		</input>
-		<output><fluidStack>rocket_fuel 2000</fluidStack></output>
+		<output>
+			<fluidStack>rocket_fuel 2000</fluidStack>
+		</output>
 	</Recipe>
-
-	<Recipe timeRequired="20" power ="30000">
+	<Recipe timeRequired="20" power="30000">
 		<input>
 			<fluidStack>water 8000</fluidStack>
 			<itemStack>minecraft:poisonous_potato 1 0</itemStack>
 		</input>
-		<output><fluidStack>hootch 2000</fluidStack></output>
+		<output>
+			<fluidStack>hootch 2000</fluidStack>
+		</output>
 	</Recipe>
-
 	<!--  -->
-	<Recipe timeRequired="40" power ="30000">
+	<Recipe timeRequired="40" power="30000">
 		<input>
 			<fluidStack>water 2500</fluidStack>
 			<oreDict>dustSilver 3</oreDict>
 			<oreDict>ice 2</oreDict>
 		</input>
-		<output><fluidStack>cloud_seed_concentrated 1250</fluidStack></output>
+		<output>
+			<fluidStack>cloud_seed_concentrated 1250</fluidStack>
+		</output>
 	</Recipe>
-
-	<Recipe timeRequired="20" power ="30000">
+	<Recipe timeRequired="20" power="30000">
 		<input>
 			<fluidStack>water 1250</fluidStack>
 			<oreDict>itemSalt 1</oreDict>
 			<oreDict>ice 1</oreDict>
 		</input>
-		<output><fluidStack>cloud_seed 1250</fluidStack></output>
+		<output>
+			<fluidStack>cloud_seed 1250</fluidStack>
+		</output>
 	</Recipe>
-
 </Recipes>
diff --git a/config/advRocketry/Crystallizer.xml b/config/advRocketry/Crystallizer.xml
@@ -21,15 +21,15 @@
 	The "useDefault" attribute will prevent loading of recipes if set to "false"
 <!-->
 <Recipes useDefault="false">
-	<Recipe timeRequired="100" power ="100000">
+	<Recipe timeRequired="100" power="100000">
 		<input>
 			<oreDict>itemSilicon</oreDict>
 		</input>
 		<output>
 			<itemStack>libvulpes:productboule 1 3</itemStack>
 		</output>
 	</Recipe>
-	<Recipe timeRequired="200" power ="100000"> 
+	<Recipe timeRequired="200" power="100000">
 		<input>
 			<itemStack>astralsorcery:itemrockcrystalsimple 1 0</itemStack>
 			<itemStack>astralsorcery:itemcraftingcomponent 1 2</itemStack>
@@ -38,7 +38,7 @@
 			<itemStack>astralsorcery:blockcelestialcrystals 1 4</itemStack>
 		</output>
 	</Recipe>
-	<Recipe timeRequired="200" power ="100000"> 
+	<Recipe timeRequired="200" power="100000">
 		<input>
 			<itemStack>astralsorcery:itemrockcrystalsimple 1 0</itemStack>
 			<itemStack>ic2:dust 1 9</itemStack>
@@ -47,7 +47,7 @@
 			<itemStack>astralsorcery:blockgemcrystals 1 2</itemStack>
 		</output>
 	</Recipe>
-	<Recipe timeRequired="200" power ="100000"> 
+	<Recipe timeRequired="200" power="100000">
 		<input>
 			<itemStack>astralsorcery:itemrockcrystalsimple 1 0</itemStack>
 			<itemStack>minecraft:glowstone_dust 1 0</itemStack>
@@ -56,7 +56,7 @@
 			<itemStack>astralsorcery:blockgemcrystals 1 3</itemStack>
 		</output>
 	</Recipe>
-	<Recipe timeRequired="200" power ="100000"> 
+	<Recipe timeRequired="200" power="100000">
 		<input>
 			<itemStack>astralsorcery:itemrockcrystalsimple 1 0</itemStack>
 			<itemStack>appliedenergistics2:material 1 3</itemStack>