Merge pull request #2228 from NillerMedDild/develop

0.4.14

.github/README.md

@@ -95,11 +95,6 @@ Re-run the script `update-server` whenever you want to update to a new modpack v
 -   A world and mod folder backup are created before updating
 -   Anything put in the `overrides` folder will be copied into the root folder when the `update-server` script is finished - I recommend you put any changed configs and added mods there.
 
-## Server Automation with Docker
-
-There's an example `docker-compose.yml` in the `docker` folder, for those who want to run the modpack server through Docker.
-It's based on [Docker Minecraft Server](https://github.com/itzg/docker-minecraft-server), please see the link for configuration and advanced usage.
-
 ## Links
 
 -   [CurseForge](https://www.curseforge.com/minecraft/modpacks/enigmatica6)

.gitignore

@@ -24,7 +24,7 @@ screenshots/
 **/*.exe
 *.dll
 **/*.zip
-
+/docker/**
 # Instance Sync
 **/*.jar
 !InstanceSync*.jar

automation/modpack-uploader.ps1

@@ -312,12 +312,7 @@ function Remove-LeadingZero {
     param(
         [string]$text
     )
-    if ($text[0] -eq "0") {
-        return $text.Substring(1)
-    }
-    else {
-        return $text
-    }
+    return $text.TrimStart(0)
 }
 
 Test-ForDependencies

automation/settings.ps1

@@ -29,11 +29,11 @@ $MODPACK_NAME = "Enigmatica6"
 $CLIENT_NAME = "Enigmatica6"
 
 # Version Of The Modpack
-$MODPACK_VERSION = "0.4.13"
+$MODPACK_VERSION = "0.4.14"
 
 # Last Version Of The Modpack
 # Needed For Changelog Parsing
-$LAST_MODPACK_VERSION = "0.4.12"
+$LAST_MODPACK_VERSION = "0.4.13"
 
 # =====================================================================//
 #  CHANGELOG SETTINGS

config/apotheosis/deadly.cfg

@@ -1,6 +1,11 @@
 # Configuration file
 
 affixes {
+    # A list of type overrides for the affix loot system.  Format is <itemname>|<type>.  Types are SWORD, RANGED, PICKAXE, SHOVEL, AXE, SHIELD [default: [minecraft:stick|SWORD]]
+    S:"Equipment Type Overrides" <
+        minecraft:stick|SWORD
+     >
+
     # The 1/n chance that a naturally spawned mob will be granted an affix item. [range: 1 ~ 500000, default: 125]
     I:"Random Affix Chance"=250
 }

config/artifacts-common.toml

@@ -1,30 +1,28 @@
 
-#To disable items or to change the frequency at which artifacts appear, override the loot tables from this mod with a data pack
-#Cosmetic slots are disabled by default, they can be enabled using the Curios config, see https://github.com/TheIllusiveC4/Curios/wiki/How-to-Use:-Users#creating-a-new-slot-type
 [campsite]
-	#Probability for an ore vein to generate underneath a campsite
-	#Range: 0 ~ 100
-	campsite_ore_chance = 25
+	#List of biome IDs in which campsites are not allowed to generate
+	#End and nether biomes are excluded by default
+	#To blacklist all biomes from a single mod, use "modid:*"
+	biome_blacklist = ["minecraft:void", "undergarden:*", "the_bumblezone:*", "twilightforest:*"]
+	#Rarity of campsites generating in the world
+	#The chance a campsite generates in a specific chunk is 1/rarity
+	#A rarity of 1 will generate a campsite in every chunk, while 10000 will generate no campsites
+	#Not every attempt at generating a campsite succeeds, this also depends on the density and shape of caves
+	#Range: 1 ~ 10000
+	rarity = 12
 	#The minimum y-level at which a campsite can generate
 	#Range: 1 ~ 255
-	campsite_min_y = 1
+	min_y = 1
 	#The maximum y-level at which a campsite can generate
-	#Range: 0 ~ 255
-	campsite_max_y = 45
-	#Whether to use wooden chests from other mods when generating campsites, may make it easier to distinguish them from mimics
-	use_modded_chests = false
+	#Range: 1 ~ 255
+	max_y = 45
 	#Probability for a container of a campsite to be replaced by a mimic
-	#Range: 0 ~ 100
-	campsite_mimic_chance = 30
-	#List of biome IDs in which campsites are not allowed to generate. End and nether biomes are excluded by default.
-	# To blacklist all biomes from a single mod, use 'modid:*'
-	biome_blacklist = ["minecraft:void", "undergarden:*"]
-	#Per-chunk probability (as a percentage) a campsite is attempted to be generated. Not every attempt succeeds, this also depends on the density and shape of caves
-	#Range: 0 ~ 100
-	campsite_chance = 8
-
-[items]
-	#Cooldown in ticks for the Everlasting Beef and Eternal Steak items
-	#Range: > 0
-	eternal_food_cooldown = 300
+	#Range: 0.0 ~ 1.0
+	mimic_chance = 0.3
+	#Probability for an ore vein to generate underneath a campsite
+	#Range: 0.0 ~ 1.0
+	ore_chance = 0.25
+	#Whether to use wooden chests from other mods when generating campsites
+	#(keeping this enabled may make it easier to distinguish them from mimics)
+	use_modded_chests = true
 

config/byg/README.txt

@@ -0,0 +1,3 @@
+If you need help understanding what the byg-biomes or byg-sub-biomes configs allow you to do, please watch this video: https://youtu.be/iq0q09O7ZYo
+
+If you need help with datapacking, please watch this: https://youtu.be/TF_p8OeB-hc

config/byg/byg-end-biomes.json

@@ -0,0 +1,211 @@
+{
+  "biomes": {
+    "betterendforge:amber_land": {
+      "dictionary": "END",
+      "weight": 5,
+      "edge": "",
+      "hills": []
+    },
+    "betterendforge:blossoming_spires": {
+      "dictionary": "END",
+      "weight": 5,
+      "edge": "",
+      "hills": []
+    },
+    "betterendforge:chorus_forest": {
+      "dictionary": "END",
+      "weight": 5,
+      "edge": "",
+      "hills": []
+    },
+    "betterendforge:crystal_mountains": {
+      "dictionary": "END",
+      "weight": 5,
+      "edge": "",
+      "hills": []
+    },
+    "betterendforge:dragon_graveyards": {
+      "dictionary": "END",
+      "weight": 5,
+      "edge": "",
+      "hills": []
+    },
+    "betterendforge:dry_shrubland": {
+      "dictionary": "END",
+      "weight": 5,
+      "edge": "",
+      "hills": []
+    },
+    "betterendforge:dust_wastelands": {
+      "dictionary": "END",
+      "weight": 5,
+      "edge": "",
+      "hills": []
+    },
+    "betterendforge:foggy_mushroomland": {
+      "dictionary": "END",
+      "weight": 5,
+      "edge": "",
+      "hills": []
+    },
+    "betterendforge:glowing_grasslands": {
+      "dictionary": "END",
+      "weight": 5,
+      "edge": "",
+      "hills": []
+    },
+    "betterendforge:ice_starfield": {
+      "dictionary": "END",
+      "weight": 5,
+      "edge": "",
+      "hills": []
+    },
+    "betterendforge:lantern_woods": {
+      "dictionary": "END",
+      "weight": 5,
+      "edge": "",
+      "hills": []
+    },
+    "betterendforge:megalake": {
+      "dictionary": "END",
+      "weight": 5,
+      "edge": "",
+      "hills": []
+    },
+    "betterendforge:megalake_grove": {
+      "dictionary": "END",
+      "weight": 5,
+      "edge": "",
+      "hills": []
+    },
+    "betterendforge:neon_oasis": {
+      "dictionary": "END",
+      "weight": 5,
+      "edge": "",
+      "hills": []
+    },
+    "betterendforge:painted_mountains": {
+      "dictionary": "END",
+      "weight": 5,
+      "edge": "",
+      "hills": []
+    },
+    "betterendforge:shadow_forest": {
+      "dictionary": "END",
+      "weight": 5,
+      "edge": "",
+      "hills": []
+    },
+    "betterendforge:sulphur_springs": {
+      "dictionary": "END",
+      "weight": 5,
+      "edge": "",
+      "hills": []
+    },
+    "betterendforge:umbrella_jungle": {
+      "dictionary": "END",
+      "weight": 5,
+      "edge": "",
+      "hills": []
+    },
+    "byg:bulbis_gardens": {
+      "dictionary": "END",
+      "weight": 5,
+      "edge": "byg:bulbis_gardens_edge",
+      "hills": []
+    },
+    "byg:cryptic_wastes": {
+      "dictionary": "END",
+      "weight": 5,
+      "edge": "",
+      "hills": []
+    },
+    "byg:ethereal_islands": {
+      "dictionary": "END",
+      "weight": 5,
+      "edge": "byg:ethereal_clearing",
+      "hills": [
+        {
+          "name": "byg:ethereal_forest",
+          "weight": 10
+        },
+        {
+          "name": "byg:ethereal_clearing",
+          "weight": 5
+        }
+      ]
+    },
+    "byg:imparius_grove": {
+      "dictionary": "END",
+      "weight": 5,
+      "edge": "byg:imparius_clearing",
+      "hills": [
+        {
+          "name": "byg:imparius_clearing",
+          "weight": 10
+        }
+      ]
+    },
+    "byg:ivis_fields": {
+      "dictionary": "END",
+      "weight": 5,
+      "edge": "",
+      "hills": []
+    },
+    "byg:nightshade_forest": {
+      "dictionary": "END",
+      "weight": 5,
+      "edge": "",
+      "hills": []
+    },
+    "byg:purpur_peaks": {
+      "dictionary": "END",
+      "weight": 5,
+      "edge": "",
+      "hills": []
+    },
+    "byg:shattered_desert": {
+      "dictionary": "END",
+      "weight": 5,
+      "edge": "",
+      "hills": []
+    },
+    "byg:shulkren_forest": {
+      "dictionary": "END",
+      "weight": 5,
+      "edge": "",
+      "hills": []
+    },
+    "minecraft:end_highlands": {
+      "dictionary": "END",
+      "weight": 5,
+      "edge": "",
+      "hills": []
+    },
+    "minecraft:end_midlands": {
+      "dictionary": "END",
+      "weight": 5,
+      "edge": "",
+      "hills": []
+    }
+  },
+  "void-biomes": {
+    "byg:shattered_desert_isles": {
+      "dictionary": "END,VOID",
+      "weight": 5,
+      "edge": "",
+      "hills": []
+    },
+    "byg:viscal_isles": {
+      "dictionary": "END,VOID",
+      "weight": 5,
+      "edge": "",
+      "hills": [
+        {
+          "name": "byg:shattered_viscal_isles",
+          "weight": 10
+        }
+      ]
+    }
+  }
+}

config/byg/byg-end-sub-biomes.json

@@ -0,0 +1,26 @@
+{
+  "biomes": {
+    "byg:bulbis_gardens_edge": {
+      "dictionary": "END",
+      "edge": ""
+    },
+    "byg:ethereal_forest": {
+      "dictionary": "END",
+      "edge": ""
+    },
+    "byg:ethereal_clearing": {
+      "dictionary": "END",
+      "edge": ""
+    },
+    "byg:imparius_clearing": {
+      "dictionary": "END",
+      "edge": ""
+    }
+  },
+  "void-biomes": {
+    "byg:shattered_viscal_isles": {
+      "dictionary": "END,VOID",
+      "edge": ""
+    }
+  }
+}

config/ftbquests/quests/chapters/blood_magic_wip.snbt

@@ -632,7 +632,7 @@
 			y: 7.0d,
 			subtitle: "Out of the Frying Pan, Into the Fire",
 			description: [
-				"Though keeping Demonic Will locked up is advised, an experienced Sanuimancer may choose to release some into the environment in order to refine it further. ",
+				"Though keeping Demonic Will locked up is advised, an experienced Sanguimancer may choose to release some into the environment in order to refine it further. ",
 				"",
 				"Placing a Tartaric Gem into a Demon Crucible will release the Will, binding it to the local chunk. The amount of will present may be seen with the aid of a Demon Will Aura Gauge. ",
 				"",

config/inventoryessentials-client.toml

@@ -6,7 +6,7 @@
 	#Should space-clicking an item move all items from that inventory at once?
 	enableBulkTransferAll = true
 	#Should ctrl-clicking only move one item at a time instead of the full stack?
-	enableSingleTransfer = true
+	enableSingleTransfer = false
 	#Use the client implementation even on servers that have the mod installed - only useful for development purposes.
 	forceClientImplementation = false
 	#Should space-clicking move all items even if an empty slot was clicked?

config/jaopca/materials/ametrine.toml

@@ -10,6 +10,8 @@
 	hasEffect = false
 	#The model type of the material.
 	modelType = "metallic"
+	#The color of this material.
+	color = 15838896
 
 #The color of this material.
 #color = 15838896