Merge pull request #1137 from NillerMedDild/develop

0.3.11
EnigmaticaModpacks · Jan 29, 2021 · 4d5d704 · 4d5d704
2 parents 7af035d + b331c5c
commit 4d5d704
Show file tree

Hide file tree

Showing 60 changed files with 1,717 additions and 1,538 deletions.
diff --git a/.github/README.md b/.github/README.md
@@ -34,7 +34,7 @@ Follow these steps to setup your workspace/server:
 
 1. Download [MultiMC](https://multimc.org/#Download) and [Git](https://git-scm.com/downloads) if you haven't already.
 2. Open MultiMC.
-3. Click Add Instance, choose Minecraft 1.16.4, click Ok.
+3. Click Add Instance, choose Minecraft 1.16.5, click Ok.
 4. Click Edit Instance (right hand side)
 5. Click Install Forge, pick the latest version.
 
@@ -45,7 +45,7 @@ Follow these steps to setup your workspace/server:
 
 ```sh
 git init                                           # Initialize git in folder
-git remote add origin URLToYourEnigmatica6Fork     # Set remote origin to your Enigmatica 5 fork
+git remote add origin URLToYourEnigmatica6Fork     # Set remote origin to your Enigmatica 6 fork
 git remote -v                                      # Verify remote
 git fetch
 git pull origin develop

diff --git a/.gitignore b/.gitignore
@@ -158,4 +158,5 @@ config/occultism-client.toml
 
 # GDLauncher
 config.json
-/natives/
+/natives/
+1.16.5.json
diff --git a/ClearClientConfigs.bat → RemoveClientConfigs.bat b/ClearClientConfigs.bat → RemoveClientConfigs.bat
diff --git a/ClearClientConfigs.ps1 → RemoveClientConfigs.bat.ps1 b/ClearClientConfigs.ps1 → RemoveClientConfigs.bat.ps1
diff --git a/building_gadgets_patterns/mekanism/basic_thermo_electric_boiler.txt b/building_gadgets_patterns/mekanism/basic_thermo_electric_boiler.txt
@@ -0,0 +1,57 @@
+{
+  "header": {
+    "version": "2.1.0",
+    "mc_version": "1.16.4",
+    "name": "Copy 38",
+    "author": "Enigmatica",
+    "bounding_box": {
+      "min_x": 0,
+      "min_y": 0,
+      "min_z": 0,
+      "max_x": 4,
+      "max_y": 8,
+      "max_z": 4
+    },
+    "material_list": {
+      "root_type": "buildinggadgets:entries",
+      "root_entry": [
+        {
+          "item_type": "buildinggadgets:simple_item",
+          "count": 80,
+          "item": {
+            "id": "mekanism:boiler_casing"
+          }
+        },
+        {
+          "item_type": "buildinggadgets:simple_item",
+          "count": 4,
+          "item": {
+            "id": "mekanism:boiler_valve"
+          }
+        },
+        {
+          "item_type": "buildinggadgets:simple_item",
+          "count": 9,
+          "item": {
+            "id": "mekanism:pressure_disperser"
+          }
+        },
+        {
+          "item_type": "buildinggadgets:simple_item",
+          "count": 78,
+          "item": {
+            "id": "mekanism:structural_glass"
+          }
+        },
+        {
+          "item_type": "buildinggadgets:simple_item",
+          "count": 9,
+          "item": {
+            "id": "mekanism:superheating_element"
+          }
+        }
+      ]
+    }
+  },
+  "body": "H4sIAAAAAAAAAK2VTW/TQBBA1zOTj0YVN5AQQup/4IJ65QziwKFwibbJNrXwR+S1K8rv4geyzj6HphdKRQ553nh2dt/YmV05d+Zs63u/cs4tVvnaqVvF0JW+Kn+GLt1wKzeLve/D0tknXwf3qg7ffVPG+vK6LavQrTc+ls1uDHxihtfHDLHvhk0/dL5a7yof4xOSrNzqc9fuQ9eXIaaMdbsN7rwd+v3Qr2MffO2mdV4+3umdr+7Cc9eYlU1a4r8nn/tNX6aJsxtfxXBM//ZPjYYUext8n4q8DlWoQ9P/Q7HfHBPtuxDj0IX1towpZRzjn1eKF5R707aVb/5ekzOn+zZaSvvLPfgUUKBCOwkoXFHkKGGsTLSTBCkOClQS28kCKQ4KVBa2kw2kOChQ2ZhNG5wRBwXqjDjo5ujM8yaEsUKDbkE+KFAXxMFU75wPClRo0B0r6KhgpkKbbhXjl411PlCgFvmmwZQgj2FKlMdwTHEYw1SfPJ7xqOf8CAXqnP3Mmbdg3oJ5SzYJBeqSecvTV6mAAhXaVIJi5MFX8BV8BV8hi+Ar+Aq+gq/gK/gKvoKv4Cv4Cr6Cr+Ar+Aq+gq/gK/gKvo/e6EyBCm161MXIg6/iq/gqvoqv4qtkVXwVX8VX8VV8FV/FV/FVfBVfxVfxVXwVX8VX8VV8H/0zMwUqtKl1FPnVLopcAmGsBXEwJTD6htE3jL6R42BKYfQNo28YfSPHwfRt9A2jbxh9I8fBVBKjbxh9w+gbOQ6memZfKFChwVRPo2/Y4aVjrAvi4NinD/mgQIWpzrZy83TWbEM3nkxDf9t27vzj0IcvZbip0gmU7l+3Q7ONybkum6+UJ11eTZf+xzeKki7HgGW+vJp+LZtv03aa8dhYfGj39xfv3qdz4sEptDw8yIvroay2aeGd3+5CHy+3Q13frx8cVr8BSJfsj8gIAAA\u003d"
+}
diff --git a/config/apotheosis/spawner.cfg b/config/apotheosis/spawner.cfg
@@ -166,6 +166,7 @@ spawn_eggs {
         resourcefulbees:coal_bee
         resourcefulbees:oreo_bee
         artifacts:mimic
+        alexsmobs:mimicube
      >
 }
 

diff --git a/config/cobblegenrandomizer-common.toml b/config/cobblegenrandomizer-common.toml
@@ -29,5 +29,5 @@
 			#   ["cobblestone", "minecraft:diamond_block", ["minecraft:diamond_block"]],
 			#   ["cobblestone", "minecraft:dirt", ["forge:dirt"]],
 			#   ["cobblestone", "minecraft:white_wool", ["minecraft:wool"]]]
-			custom_generators = [["cobblestone", "minecraft:iron_block", ["enigmatica:cobbleworks/cobblestone"]], ["cobblestone", "byg:dacite_cobblestone", ["byg:dacite_cobblestone"]], ["cobblestone", "byg:ether_stone", ["byg:ether_stone"]], ["cobblestone", "byg:red_rock", ["byg:red_rock"]], ["cobblestone", "byg:scoria_cobblestone", ["byg:scoria_cobblestone"]], ["cobblestone", "byg:soapstone", ["byg:soapstone"]], ["cobblestone", "byg:purpur_stone", ["byg:purpur_stone"]], ["cobblestone", "embellishcraft:basalt_cobblestone", ["embellishcraft:basalt_cobblestone"]], ["cobblestone", "embellishcraft:gneiss_cobblestone", ["embellishcraft:gneiss_cobblestone"]], ["cobblestone", "embellishcraft:jade_cobblestone", ["embellishcraft:jade_cobblestone"]], ["cobblestone", "embellishcraft:larvikite_cobblestone", ["embellishcraft:larvikite_cobblestone"]], ["cobblestone", "embellishcraft:marble_cobblestone", ["embellishcraft:marble_cobblestone"]], ["cobblestone", "embellishcraft:slate_cobblestone", ["embellishcraft:slate_cobblestone"]], ["cobblestone", "minecraft:blackstone", ["minecraft:blackstone"]], ["cobblestone", "create:andesite_cobblestone", ["create:andesite_cobblestone"]], ["cobblestone", "create:diorite_cobblestone", ["create:diorite_cobblestone"]], ["cobblestone", "create:granite_cobblestone", ["create:granite_cobblestone"]], ["cobblestone", "quark:cobbedstone", ["quark:cobbedstone"]], ["cobblestone", "undergarden:depthrock", ["undergarden:depthrock"]], ["cobblestone", "undergarden:shiverstone", ["undergarden:shiverstone"]], ["cobblestone", "create:dark_scoria_cobblestone", ["create:dark_scoria_cobblestone"]], ["cobblestone", "create:scoria_cobblestone", ["create:scoria_cobblestone"]], ["cobblestone", "create:gabbro_cobblestone", ["create:gabbro_cobblestone"]], ["cobblestone", "create:dolomite_cobblestone", ["create:dolomite_cobblestone"]], ["cobblestone", "create:weathered_limestone_cobblestone", ["create:weathered_limestone_cobblestone"]], ["cobblestone", "create:limestone_cobblestone", ["create:limestone_cobblestone"]], ["stone", "minecraft:diamond_block", ["enigmatica:cobbleworks/stone"]], ["stone", "minecraft:andesite", ["minecraft:andesite"]], ["stone", "minecraft:diorite", ["minecraft:diorite"]], ["stone", "minecraft:granite", ["minecraft:granite"]], ["stone", "byg:black_sandstone", ["byg:black_sandstone"]], ["stone", "byg:blue_sandstone", ["byg:blue_sandstone"]], ["stone", "byg:dacite", ["byg:dacite"]], ["stone", "byg:purple_sandstone", ["byg:purple_sandstone"]], ["stone", "byg:scoria_stone", ["byg:scoria_stone"]], ["stone", "byg:white_sandstone", ["byg:white_sandstone"]], ["stone", "byg:pink_sandstone", ["byg:pink_sandstone"]], ["stone", "embellishcraft:basalt", ["embellishcraft:basalt"]], ["stone", "embellishcraft:gneiss", ["embellishcraft:gneiss"]], ["stone", "embellishcraft:jade", ["embellishcraft:jade"]], ["stone", "embellishcraft:larvikite", ["embellishcraft:larvikite"]], ["stone", "embellishcraft:marble", ["embellishcraft:marble"]], ["stone", "embellishcraft:slate", ["embellishcraft:slate"]], ["stone", "minecraft:red_sandstone", ["minecraft:red_sandstone"]], ["stone", "minecraft:sandstone", ["minecraft:sandstone"]], ["stone", "quark:basalt", ["quark:basalt"]], ["stone", "quark:brimstone", ["quark:brimstone"]], ["stone", "quark:jasper", ["quark:jasper"]], ["stone", "quark:limestone", ["quark:limestone"]], ["stone", "quark:marble", ["quark:marble"]], ["stone", "quark:permafrost", ["quark:permafrost"]], ["stone", "quark:slate", ["quark:slate"]], ["stone", "quark:myalite", ["quark:myalite"]], ["stone", "astralsorcery:marble_raw", ["astralsorcery:marble_raw"]], ["stone", "create:dark_scoria", ["create:dark_scoria"]], ["stone", "create:scoria", ["create:scoria"]], ["stone", "create:gabbro", ["create:gabbro"]], ["stone", "create:dolomite", ["create:dolomite"]], ["stone", "create:weathered_limestone", ["create:weathered_limestone"]], ["stone", "create:limestone", ["create:limestone"]], ["stone", "biomesoplenty:white_sandstone", ["biomesoplenty:white_sandstone"]], ["stone", "biomesoplenty:orange_sandstone", ["biomesoplenty:orange_sandstone"]], ["stone", "biomesoplenty:black_sandstone", ["biomesoplenty:black_sandstone"]]]
+			custom_generators = [["cobblestone", "minecraft:iron_block", ["enigmatica:cobbleworks/cobblestone"]], ["cobblestone", "embellishcraft:basalt_cobblestone", ["embellishcraft:basalt_cobblestone"]], ["cobblestone", "embellishcraft:gneiss_cobblestone", ["embellishcraft:gneiss_cobblestone"]], ["cobblestone", "embellishcraft:jade_cobblestone", ["embellishcraft:jade_cobblestone"]], ["cobblestone", "embellishcraft:larvikite_cobblestone", ["embellishcraft:larvikite_cobblestone"]], ["cobblestone", "embellishcraft:marble_cobblestone", ["embellishcraft:marble_cobblestone"]], ["cobblestone", "embellishcraft:slate_cobblestone", ["embellishcraft:slate_cobblestone"]], ["cobblestone", "minecraft:blackstone", ["minecraft:blackstone"]], ["cobblestone", "create:andesite_cobblestone", ["create:andesite_cobblestone"]], ["cobblestone", "create:diorite_cobblestone", ["create:diorite_cobblestone"]], ["cobblestone", "create:granite_cobblestone", ["create:granite_cobblestone"]], ["cobblestone", "quark:cobbedstone", ["quark:cobbedstone"]], ["cobblestone", "undergarden:depthrock", ["undergarden:depthrock"]], ["cobblestone", "undergarden:shiverstone", ["undergarden:shiverstone"]], ["cobblestone", "create:dark_scoria_cobblestone", ["create:dark_scoria_cobblestone"]], ["cobblestone", "create:scoria_cobblestone", ["create:scoria_cobblestone"]], ["cobblestone", "create:gabbro_cobblestone", ["create:gabbro_cobblestone"]], ["cobblestone", "create:dolomite_cobblestone", ["create:dolomite_cobblestone"]], ["cobblestone", "create:weathered_limestone_cobblestone", ["create:weathered_limestone_cobblestone"]], ["cobblestone", "create:limestone_cobblestone", ["create:limestone_cobblestone"]], ["stone", "minecraft:diamond_block", ["enigmatica:cobbleworks/stone"]], ["stone", "minecraft:andesite", ["minecraft:andesite"]], ["stone", "minecraft:diorite", ["minecraft:diorite"]], ["stone", "minecraft:granite", ["minecraft:granite"]], ["stone", "embellishcraft:basalt", ["embellishcraft:basalt"]], ["stone", "embellishcraft:gneiss", ["embellishcraft:gneiss"]], ["stone", "embellishcraft:jade", ["embellishcraft:jade"]], ["stone", "embellishcraft:larvikite", ["embellishcraft:larvikite"]], ["stone", "embellishcraft:marble", ["embellishcraft:marble"]], ["stone", "embellishcraft:slate", ["embellishcraft:slate"]], ["stone", "minecraft:red_sandstone", ["minecraft:red_sandstone"]], ["stone", "minecraft:sandstone", ["minecraft:sandstone"]], ["stone", "quark:basalt", ["quark:basalt"]], ["stone", "quark:brimstone", ["quark:brimstone"]], ["stone", "quark:jasper", ["quark:jasper"]], ["stone", "quark:limestone", ["quark:limestone"]], ["stone", "quark:marble", ["quark:marble"]], ["stone", "quark:permafrost", ["quark:permafrost"]], ["stone", "quark:slate", ["quark:slate"]], ["stone", "quark:myalite", ["quark:myalite"]], ["stone", "astralsorcery:marble_raw", ["astralsorcery:marble_raw"]], ["stone", "create:dark_scoria", ["create:dark_scoria"]], ["stone", "create:scoria", ["create:scoria"]], ["stone", "create:gabbro", ["create:gabbro"]], ["stone", "create:dolomite", ["create:dolomite"]], ["stone", "create:weathered_limestone", ["create:weathered_limestone"]], ["stone", "create:limestone", ["create:limestone"]]]
 
diff --git a/config/ftbquests/quests/chapters/challenges.snbt b/config/ftbquests/quests/chapters/challenges.snbt
@@ -1,7 +1,7 @@
 {
 	id: 152,
 	filename: "challenges",
-	order_index: 27,
+	order_index: 28,
 	title: "Challenges WIP",
 	icon: "minecraft:wither_skeleton_skull",
 	always_invisible: true,

diff --git a/config/ftbquests/quests/chapters/create.snbt b/config/ftbquests/quests/chapters/create.snbt
@@ -1079,11 +1079,16 @@
 				"",
 				"Several advanced items may only be crafted this way.",
 				"",
-				"Crafter Slot Covers can be used to disable a given slot, which is required for any craft that has empty spaces in it. For instance, when crafting a chest with a 3x3 grid of Mechanical Crafters, the middle slot would be covered. ",
+				"Take note when placing the crafters themselves as there will be an arrow pointing towards the block that was clicked to place it. This arrow indicates which way items will travel as the crafters work and all arrows must connect to a single crafter.",
+				"",
+				"For example, placing the first crafter on the ground will make the arrow point down, this would be the output. A crafter to the side of the first would need to be placed against the side so that its arrow points into the first, making a channel. ",
+				"",
+				"Crafter Slot Covers can be used to disable a given slot, which is required for any craft that has empty spaces in it. For instance, when crafting a chest with a 3x3 grid of Mechanical Crafters, the middle slot must be covered. ",
 				"",
 				"Items may be inserted with hoppers, belts and funnels, mechanical arms and more. Experiment to see what you can come up with!"
 			],
 			dependencies: [I;3330],
+			min_width: 250,
 			id: 3354,
 			tasks: [
 				{
@@ -1333,7 +1338,9 @@
 				"",
 				"Worry not, once the contraption is formed, the glue marks will become invisible, allowing for very aesthetic builds.",
 				"",
-				"Use your scroll wheel while holding a wrench and looking at the chassis to configure its capture range. "
+				"Use your scroll wheel while holding a wrench and looking at the chassis to configure its capture range. ",
+				"",
+				"Note: A slime ball may be used infinitely to set glue marks on Chassis blocks themselves. Right-Click with the slime ball to apply to one side. Double Right-Click to apply to all sides."
 			],
 			dependencies: [I;
 				3373,