chore: update changelog & staging of item

DarkPacks · Jun 8, 2018 · 6e2f3aa · 6e2f3aa · artdude543 · Jun 8, 2018
1 parent 18fca4e
commit 6e2f3aa
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 8 deletions.
diff --git a/src/config/mputils/changelog.txt b/src/config/mputils/changelog.txt
@@ -117,7 +117,7 @@ Mods Added:
 * Aroma Backup (2.1.1.3)
 * Aroma Core (1.3.0.2)
     * Needed for Aroma Backpack
-* Construct's Armory (0.0.19-b)
+* Construct's Armory (0.0.21-rc1)
     * Armor add-on mod for Tinkers' Construct
 * SevTweaks (0.1.0)
     * Custom mod to allow more integration with mods in the pack.
@@ -240,6 +240,7 @@ Mod Updates:
     * Fix incorrect regex_groups operators output type.
 * Just Enough Items (4.9.1.196)
 * KleeSlabs (5.4.10)
+* Mekanism (9.4.11.346)
 * MJRLegends Lib (1.1.4)
 * Modular Routers (3.1.5)
     * Fix item dupe with Dropper/Flinger in some circumstances.
@@ -288,6 +289,8 @@ Mod Updates:
     * Fix faucets trying to drain from the wrong side
     * Several smaller fixes/changes that got lost in translation
     * Try to impliment FastWorkbench
+* Tinkers' Tool Leveling (1.0.5)
+    * Fix a rare crash when having a level up at the same time as dropping your weapon.
 * Toast Control (1.6.0)
 * Triumph (1.13.0)
     * Added support for new Better Advancements options

diff --git a/src/scripts/recipes/remove_and_hide.zs b/src/scripts/recipes/remove_and_hide.zs
@@ -200,6 +200,8 @@ static removeAndHideItems as IItemStack[] = [
 
 	//Construct's Armory
 	<conarm:travel_belt>,
+	<conarm:travel_belt_base>,
+	<conarm:travel_potion>,
 	<conarm:travel_sack>,
 
 	//Natura
@@ -311,9 +313,6 @@ static removeAndHideItems as IItemStack[] = [
 	//Mekanism
 	<mekanism:machineblock:4>, //Bye bye miner!
 
-	// New Book Don't Use! (Yet)
-	<valkyrielib:guide>,
-
 	// Still in DEV! Won't enable till it's finished.
 	<cyclicmagic:robot_spawner>,
 

diff --git a/src/scripts/staging/item_and_recipes/02_two/items.zs b/src/scripts/staging/item_and_recipes/02_two/items.zs
@@ -1042,11 +1042,16 @@ var stage2Items as IIngredient[] = [
 	<conarm:armorforge>.withTag({textureBlock: {id: "mekanism:basicblock", Count: 1 as byte, Damage: 13 as short}}),
 	<conarm:armorforge>.withTag({textureBlock: {id: "minecraft:gold_block", Count: 1 as byte, Damage: 0 as short}}),
 	<conarm:armorforge>.withTag({textureBlock: {id: "minecraft:iron_block", Count: 1 as byte, Damage: 0 as short}}),
-	<conarm:armorforge>.withTag({textureBlock: {id: "twilightforest:block_storage", Count: 1 as byte, Damage: 2 as short}}),
 	<conarm:armorforge>.withTag({textureBlock: {id: "twilightforest:block_storage", Count: 1 as byte, Damage: 1 as short}}),
+	<conarm:armorforge>.withTag({textureBlock: {id: "twilightforest:block_storage", Count: 1 as byte, Damage: 2 as short}}),
 	<conarm:armorstation>,
 	<conarm:book>,
+	<conarm:gauntlet_mat>,
+	<conarm:gauntlet_mat_speed>,
+	<conarm:travel_cloak>,
 	<conarm:travel_goggles>,
+	<conarm:travel_goggles_base>,
+	<conarm:travel_slowfall>,
 
 	//Dark Utils
 	<darkutils:charm_null>,

diff --git a/src/scripts/staging/item_and_recipes/02_two/recipes.set.zs b/src/scripts/staging/item_and_recipes/02_two/recipes.set.zs
@@ -488,11 +488,17 @@ var itemsForStage as IIngredient[] = [
 	<conarm:armorforge>.withTag({textureBlock: {id: "mekanism:basicblock", Count: 1 as byte, Damage: 13 as short}}),
 	<conarm:armorforge>.withTag({textureBlock: {id: "minecraft:gold_block", Count: 1 as byte, Damage: 0 as short}}),
 	<conarm:armorforge>.withTag({textureBlock: {id: "minecraft:iron_block", Count: 1 as byte, Damage: 0 as short}}),
-	<conarm:armorforge>.withTag({textureBlock: {id: "twilightforest:block_storage", Count: 1 as byte, Damage: 2 as short}}),
 	<conarm:armorforge>.withTag({textureBlock: {id: "twilightforest:block_storage", Count: 1 as byte, Damage: 1 as short}}),
+	<conarm:armorforge>.withTag({textureBlock: {id: "twilightforest:block_storage", Count: 1 as byte, Damage: 2 as short}}),
 	<conarm:armorstation>,
 	<conarm:book>,
+	<conarm:gauntlet_mat>,
+	<conarm:gauntlet_mat_speed>,
+	<conarm:travel_belt_base>,
+	<conarm:travel_cloak>,
 	<conarm:travel_goggles>,
+	<conarm:travel_goggles_base>,
+	<conarm:travel_slowfall>,
 
 	//Iron Backpacks
 	<ironbackpacks:backpack>.withTag({packInfo: {upgrade: [], type: "ironbackpacks:gold", spec: "STORAGE"}}),

diff --git a/src/scripts/staging/item_and_recipes/03_three/items.zs b/src/scripts/staging/item_and_recipes/03_three/items.zs
@@ -1322,11 +1322,15 @@ var stage3Items as IIngredient[] = [
 	<conarm:armorforge>.withTag({textureBlock: {id: "immersiveengineering:storage", Count: 1 as byte, Damage: 8 as short}}),
 	<conarm:armorforge>.withTag({textureBlock: {id: "tconstruct:metal", Count: 1 as byte, Damage: 3 as short}}),
 	<conarm:armorforge>.withTag({textureBlock: {id: "tconstruct:metal", Count: 1 as byte, Damage: 5 as short}}),
+	<conarm:gauntlet_mat_attack>,
+	<conarm:gauntlet_mat_reach>,
+	<conarm:resist_mat>,
 	<conarm:resist_mat_blast>,
 	<conarm:resist_mat_fire>,
 	<conarm:resist_mat_proj>,
-	<conarm:resist_mat>,
 	<conarm:travel_night>,
+	<conarm:travel_sneak>,
+	<conarm:travel_soul>,
 
 	//AbyssalCraft
 	<abyssalcraft:azathothcharm:2>,

diff --git a/src/scripts/staging/item_and_recipes/03_three/recipes.set.zs b/src/scripts/staging/item_and_recipes/03_three/recipes.set.zs
@@ -427,11 +427,15 @@ var itemsForStage as IIngredient[] = [
 	<conarm:armorforge>.withTag({textureBlock: {id: "immersiveengineering:storage", Count: 1 as byte, Damage: 8 as short}}),
 	<conarm:armorforge>.withTag({textureBlock: {id: "tconstruct:metal", Count: 1 as byte, Damage: 3 as short}}),
 	<conarm:armorforge>.withTag({textureBlock: {id: "tconstruct:metal", Count: 1 as byte, Damage: 5 as short}}),
+	<conarm:gauntlet_mat_attack>,
+	<conarm:gauntlet_mat_reach>,
+	<conarm:resist_mat>,
 	<conarm:resist_mat_blast>,
 	<conarm:resist_mat_fire>,
 	<conarm:resist_mat_proj>,
-	<conarm:resist_mat>,
 	<conarm:travel_night>,
+	<conarm:travel_sneak>,
+	<conarm:travel_soul>,
 
 	//Better With Mods
 	<betterwithmods:raw_pastry>,