Hotfix 1.7.1

ArtpokeBr · Dec 30, 2022 · 4fe452a · 4fe452a
1 parent 72bc8f7
commit 4fe452a
Show file tree

Hide file tree

Showing 10 changed files with 37,605 additions and 37,110 deletions.
diff --git a/config/AppliedEnergistics2/VersionChecker.cfg b/config/AppliedEnergistics2/VersionChecker.cfg
@@ -3,7 +3,7 @@
 cache {
     # Waits as many hours, until it checks again. [range: 0 ~ 168, default: 24]
     I:interval=24
-    S:lastCheck=1672261822060
+    S:lastCheck=1672357364179
 }
 
 

diff --git a/config/InvTweaks/InvTweaks.cfg b/config/InvTweaks/InvTweaks.cfg
@@ -1,6 +1,6 @@
 #Inventory Tweaks Configuration
 #(Regarding shortcuts, all key names can be found at: http://legacy.lwjgl.org/javadoc/org/lwjgl/input/Keyboard.html)
-#Thu Dec 29 15:39:51 BRST 2022
+#Thu Dec 29 22:50:41 BRST 2022
 enableMiddleClick=false
 showChestButtons=true
 enableSortingOnPickup=false

diff --git a/config/customloadingscreen_timings.nbt b/config/customloadingscreen_timings.nbt
diff --git a/config/jei/worldSettings.cfg b/config/jei/worldSettings.cfg
@@ -58,6 +58,7 @@ world68 {
 
 
 world68597 {
+    # Show the list of bookmarks next to open GUIs.
     B:bookmarkOverlayEnabled=false
 
     # Give items instead of showing the recipe.
@@ -68,7 +69,7 @@ world68597 {
 
     # Hide and unhide ingredients by clicking them in the list.
     B:editEnabled=false
-    S:filterText=knife
+    S:filterText=@minecraft $gem
 
     # Show the list of ingredients next to open GUIs.
     B:overlayEnabled=true

diff --git a/config/mputils/changelog.txt b/config/mputils/changelog.txt
@@ -1,27 +1,17 @@
-§a§lVersion Beta§r§f 1.7:
+§a§lVersion Beta§r§f 1.7.1:
+
+A Hotfix Update
 
 §b§lAdditions§r§f:
 
-- Updated GTCEU
-- Updated AE2 Extended Life
 - Updated Deep Mob Evolution
 
-- Farming for Blockheads
-
 §c§lRemovals§r§f:
 
 §2§lFixes§r§f:
 
-- Adjusted Hunter's Knife Recipe, Leather Strap --> Twine.
-- All Gem's can now be correctly made in the Autoclave.
-- The Gem Cast from Tinker's is now removed.
-- Vanilla Gem's can now be obtained using an Forge Hammer (Really inefficient, only for the Early Stages).
-- Fixed Obsidian Dust and Crushed Obsidian from Railcraft recipe overlap.
-- Adjusted Roots Knife Recipe, Hardened Leather --> Pressed Wax.
-- Since Osmiridium Alloying cannot be removed from the Smeltery, it cannot be solidified anymore.
+- Fixed issue with the previous update with Gem's in the Forge Hammer.
 
 §5§lMiscellaneous§r§f:
 
-- The Carcass Quest in the First Chapter now has a correct dependency.
-- Tools don't drop "tiny fragments" anymore. (Unfortunatly Flint Tool's where bypassing this mechanic before)
-- The Farmer now has incresed his store, go check out his new items!
+- Reduced Chance of Failure in Pyrotech Kilns.
diff --git a/config/splash.properties b/config/splash.properties
@@ -1,5 +1,5 @@
 #Splash screen properties
-#Thu Dec 29 15:35:29 BRST 2022
+#Thu Dec 29 22:46:26 BRST 2022
 background=0x389E82
 memoryGood=0xFFFFFF
 font=0x08151E
@@ -9,8 +9,8 @@ memoryLow=0x1D5E5C
 rotate=false
 memoryWarn=0xE6E84A
 showMemory=true
-enabled=true
 bar=0xFFFFFF
+enabled=true
 resourcePackPath=resources
 logoOffset=0
 forgeTexture=fml\:textures/gui/cat.gif

diff --git a/config/thaumicjei_itemstack_aspects.json b/config/thaumicjei_itemstack_aspects.json
diff --git a/mods/DeepMobEvolution-1.0.1.jar → mods/DeepMobEvolution-1.1.2.jar b/mods/DeepMobEvolution-1.0.1.jar → mods/DeepMobEvolution-1.1.2.jar
diff --git a/scripts/Mod Specifics/GregTech/Gem Processing.zs b/scripts/Mod Specifics/GregTech/Gem Processing.zs
@@ -40,21 +40,68 @@ import mods.bloodmagic.AlchemyArray as AlchemyArray;
 // Vanilla Gems in the Alchemy Array
 
 var VanillaGems as IOreDictEntry[IOreDictEntry] = {
-	<ore:oreDiamond> : <ore:gemDiamond>,
-	<ore:oreEmerald> : <ore:gemEmerald>,
-	<ore:oreLapis> : <ore:gemLapis>,
-	<ore:oreCoal> : <ore:gemCoal>,
-	<ore:oreNetherQuartz> : <ore:gemNetherQuartz>
+
+    <ore:oreDiamond> : <ore:gemDiamond>,
+    <ore:oreRedSandDiamond> : <ore:gemDiamond>,
+    <ore:oreSandDiamond> : <ore:gemDiamond>,
+    <ore:oreGraniteDiamond> : <ore:gemDiamond>,
+    <ore:oreDioriteDiamond> : <ore:gemDiamond>,
+    <ore:oreAndesiteDiamond> : <ore:gemDiamond>,
+    <ore:oreBlackgraniteDiamond> : <ore:gemDiamond>,
+    <ore:oreRedgraniteDiamond> : <ore:gemDiamond>,
+    <ore:oreMarbleDiamond> : <ore:gemDiamond>,
+    <ore:oreBasaltDiamond> : <ore:gemDiamond>,
+
+    <ore:oreEmerald> : <ore:gemEmerald>,
+    <ore:oreRedSandEmerald> : <ore:gemEmerald>,
+    <ore:oreSandEmerald> : <ore:gemEmerald>,
+    <ore:oreGraniteEmerald> : <ore:gemEmerald>,
+    <ore:oreDioriteEmerald> : <ore:gemEmerald>,
+    <ore:oreAndesiteEmerald> : <ore:gemEmerald>,
+    <ore:oreBlackgraniteEmerald> : <ore:gemEmerald>,
+    <ore:oreRedgraniteEmerald> : <ore:gemEmerald>,
+    <ore:oreMarbleEmerald> : <ore:gemEmerald>,
+    <ore:oreBasaltEmerald> : <ore:gemEmerald>,
+
+    <ore:oreLapis> : <ore:gemLapis>,
+    <ore:oreRedSandLapis> : <ore:gemLapis>,
+    <ore:oreSandLapis> : <ore:gemLapis>,
+    <ore:oreGraniteLapis> : <ore:gemLapis>,
+    <ore:oreDioriteLapis> : <ore:gemLapis>,
+    <ore:oreAndesiteLapis> : <ore:gemLapis>,
+    <ore:oreBlackgraniteLapis> : <ore:gemLapis>,
+    <ore:oreRedgraniteLapis> : <ore:gemLapis>,
+    <ore:oreMarbleLapis> : <ore:gemLapis>,
+    <ore:oreBasaltLapis> : <ore:gemLapis>,
+
+    <ore:oreCoal> : <ore:gemCoal>,
+    <ore:oreRedSandCoal> : <ore:gemCoal>,
+    <ore:oreSandCoal> : <ore:gemCoal>,
+    <ore:oreGraniteCoal> : <ore:gemCoal>,
+    <ore:oreDioriteCoal> : <ore:gemCoal>,
+    <ore:oreAndesiteCoal> : <ore:gemCoal>,
+    <ore:oreBlackgraniteCoal> : <ore:gemCoal>,
+    <ore:oreRedgraniteCoal> : <ore:gemCoal>,
+    <ore:oreMarbleCoal> : <ore:gemCoal>,
+    <ore:oreBasaltCoal> : <ore:gemCoal>,
+
+    <ore:oreNetherQuartz> : <ore:gemNetherQuartz>,
+    <ore:oreRedSandNetherQuartz> : <ore:gemNetherQuartz>,
+    <ore:oreSandNetherQuartz> : <ore:gemNetherQuartz>,
+    <ore:oreGraniteNetherQuartz> : <ore:gemNetherQuartz>,
+    <ore:oreDioriteNetherQuartz> : <ore:gemNetherQuartz>,
+    <ore:oreAndesiteNetherQuartz> : <ore:gemNetherQuartz>,
+    <ore:oreBlackgraniteNetherQuartz> : <ore:gemNetherQuartz>,
+    <ore:oreRedgraniteNetherQuartz> : <ore:gemNetherQuartz>,
+    <ore:oreMarbleNetherQuartz> : <ore:gemNetherQuartz>,
+    <ore:oreBasaltNetherQuartz> : <ore:gemNetherQuartz>,
+
 };
 
 for ore, gem in VanillaGems {
 
-	hammer.recipeBuilder()
-    	.inputs(ore.firstItem)
-    	.chancedOutput(gem.firstItem*2, 5000, 150)
-    	.duration(2000)
-    	.EUt(4)
-    .buildAndRegister();
+    furnace.addRecipe(gem.firstItem, ore.firstItem);
+
 }
 
 

diff --git a/scripts/Mod Specifics/Pyrotech/Kilns.zs b/scripts/Mod Specifics/Pyrotech/Kilns.zs
@@ -15,7 +15,7 @@ PitKiln.addRecipe(
   <pyrotech:bucket_clay>,          // recipe output
   <pyrotech:bucket_clay_unfired>,          // recipe input
   16000,          // recipe duration in ticks
-  0.33,
+  0.10,
   [<pyrotech:material:6>, <pyrotech:material:7>, <ore:dustAsh>.firstItem * 2],
   true // true if the recipe should be inherited
 );
@@ -25,7 +25,7 @@ PitKiln.addRecipe(
   <pyrotech:clay_shears>,          // recipe output
   <pyrotech:unfired_clay_shears>,          // recipe input
   16000,          // recipe duration in ticks
-  0.33,
+  0.10,
   [<pyrotech:material:6>, <pyrotech:material:7>, <ore:dustAsh>.firstItem * 2],
   true // true if the recipe should be inherited
 );
@@ -35,7 +35,7 @@ PitKiln.addRecipe(
   <minecraft:brick>,          // recipe output
   <pyrotech:material:24>,          // recipe input
   16000,          // recipe duration in ticks
-  0.33,
+  0.10,
   [<pyrotech:material:6>, <pyrotech:material:7>, <ore:dustAsh>.firstItem * 2],
   true // true if the recipe should be inherited
 );
@@ -45,7 +45,7 @@ PitKiln.addRecipe(
   <minecraft:hardened_clay>,          // recipe output
   <minecraft:clay>,          // recipe input
   16000,          // recipe duration in ticks
-  0.33,
+  0.10,
   [<pyrotech:material:6>, <pyrotech:material:7>, <ore:dustAsh>.firstItem * 2],
   true // true if the recipe should be inherited
 );
@@ -55,7 +55,7 @@ PitKiln.addRecipe(
   <minecraft:stone_slab>,          // recipe output
   <minecraft:stone_slab:3>,          // recipe input
   16000,          // recipe duration in ticks
-  0.33,
+  0.10,
   [<pyrotech:rock> * 3, <ore:dustAsh>.firstItem],
   true // true if the recipe should be inherited
 );
@@ -65,7 +65,7 @@ PitKiln.addRecipe(
   <minecraft:stone>,          // recipe output
   <minecraft:cobblestone>,          // recipe input
   16000,          // recipe duration in ticks
-  0.33,
+  0.10,
   [<pyrotech:rock> * 5, <ore:dustAsh>.firstItem],
   true // true if the recipe should be inherited
 );
@@ -75,7 +75,7 @@ PitKiln.addRecipe(
   <minecraft:stone:5>,          // recipe output
   <pyrotech:cobblestone>,          // recipe input
   16000,          // recipe duration in ticks
-  0.33,
+  0.10,
   [<pyrotech:rock:3> * 5, <ore:dustAsh>.firstItem],
   true // true if the recipe should be inherited
 );
@@ -85,7 +85,7 @@ PitKiln.addRecipe(
   <minecraft:stone:1>,          // recipe output
   <pyrotech:cobblestone:2>,          // recipe input
   16000,          // recipe duration in ticks
-  0.33,
+  0.10,
   [<pyrotech:rock:1> * 5, <ore:dustAsh>.firstItem],
   true // true if the recipe should be inherited
 );
@@ -95,7 +95,7 @@ PitKiln.addRecipe(
   <minecraft:stone:3>,          // recipe output
   <pyrotech:cobblestone:1>,          // recipe input
   16000,          // recipe duration in ticks
-  0.33,
+  0.10,
   [<pyrotech:rock:2> * 5, <ore:dustAsh>.firstItem],
   true // true if the recipe should be inherited
 );
@@ -105,7 +105,7 @@ PitKiln.addRecipe(
   <pyrotech:limestone>,          // recipe output
   <pyrotech:cobblestone:3>,          // recipe input
   16000,          // recipe duration in ticks
-  0.33,
+  0.10,
   [<pyrotech:rock:8> * 5, <ore:dustAsh>.firstItem],
   true // true if the recipe should be inherited
 );
@@ -115,7 +115,7 @@ PitKiln.addRecipe(
   <gregtech:meta_item_1:353>,          // recipe output
   <gregtech:meta_item_1:350>,          // recipe input
   16000,          // recipe duration in ticks
-  0.33,
+  0.10,
   [<pyrotech:rock:5> * 5, <pyrotech:material:17> * 2],
   true // true if the recipe should be inherited
 );
@@ -125,7 +125,7 @@ PitKiln.addRecipe(
   <pyrotech:material:22>,          // recipe output
   <ore:dustLimestone>,          // recipe input
   16000,          // recipe duration in ticks
-  0.33,
+  0.10,
   [<ore:dustAsh>.firstItem * 2, <pyrotech:rock:5> * 4],
   true // true if the recipe should be inherited
 );
@@ -135,7 +135,7 @@ PitKiln.addRecipe(
   <ceramics:unfired_clay:5>,          // recipe output
   <contenttweaker:unfiredporcelainbrick>,          // recipe input
   16000,          // recipe duration in ticks
-  0.33,
+  0.10,
   [<pyrotech:material:17> * 4, <ore:dustSmallQuartzSand>.firstItem * 2, <ore:dustTinyBone>.firstItem * 2],
   true // true if the recipe should be inherited
 );
@@ -145,7 +145,7 @@ PitKiln.addRecipe(
   <pyrotech:material:32> * 2,          // recipe output
   <ore:sand>,          // recipe input
   16000,          // recipe duration in ticks
-  0.33,
+  0.10,
   [<pyrotech:rock:5> * 4, <ore:dustAsh>.firstItem * 2],
   true // true if the recipe should be inherited
 );