Merge branch 'develop'

.gitignore

@@ -83,3 +83,4 @@ ma-essentials/default_kits.json
 config/craftingtweaks-client.toml
 new.json
 old.json
+reauth.toml

ModpackUploader.ps1

@@ -50,7 +50,7 @@ if ($ENABLE_MANIFEST_BUILDER_MODULE) {
 }
 
 if ($ENABLE_CHANGELOG_GENERATOR_MODULE -and $ENABLE_MODPACK_UPLOADER_MODULE) {
-    Remove-Item oldmanifest.json, manifest.json, shortchangelog.txt, MOD_CHANGELOGS.txt -ErrorAction SilentlyContinue
+	Remove-Item old.json, new.json, changelog.txt -ErrorAction SilentlyContinue
     sz e "$CLIENT_FILENAME`-$LAST_MODPACK_VERSION.zip" manifest.json
     Rename-Item -Path manifest.json -NewName old.json
     sz e "$CLIENT_FILENAME`-$MODPACK_VERSION.zip" manifest.json
@@ -62,8 +62,10 @@ if ($ENABLE_CHANGELOG_GENERATOR_MODULE -and $ENABLE_MODPACK_UPLOADER_MODULE) {
     Write-Host "Generating changelog..." -ForegroundColor Green
     Write-Host ""
 
-    java -jar ChangelogGenerator-2.0.0-pre2.jar
+    java -jar ChangelogGenerator-2.0.0-pre3.jar
 	Move-Item -Path changelog.txt -Destination changelogs/CHANGELOG_MODS_$MODPACK_VERSION.txt
+
+	Remove-Item old.json, new.json, changelog.txt -ErrorAction SilentlyContinue
 }
 
 if ($ENABLE_GITHUB_CHANGELOG_GENERATOR_MODULE) {

changelogs/CHANGELOG-MODS.md

@@ -1,3 +1,16 @@
+# 0.4.9 -> 0.4.10
+
+* bountiful-3.0.0.jar
+* citadel-1.0.4-1.14.4.jar
+* cyclepaintings_1.14-1.1.jar
+* easyelytrato_1.14-1.2.jar
+* EnchantmentDescriptions-1.14.4-1.3.14.jar
+* engineersdecor-1.14.4-1.0.20-b1.jar
+* Kottle-1.4.0.jar
+* SimpleDiscordRichPresence-1.0.3.jar
+* tetra-1.14.4-1.25.0.jar
+* Xaeros_Minimap_20.5.1_Forge_1.14.4.jar
+
 # 0.4.8 -> 0.4.9
 
 * Botania r1.11-378.jar

changelogs/CHANGELOG.md

@@ -1,3 +1,34 @@
+## Enigmatica 4 v0.5.0
+
+### This is a major update, make sure to backup your world before updating! 
+There is a chance that this new update does not work with your current world.
+
+*Forge-1.14.4-28.2.3*
+*[Mod List](https://github.com/NillerMedDild/Enigmatica4/blob/master/CHANGELOG_MODS_0.5.0.txt)*
+
+**Added Mods**
+
+- [Passthrough Signs](https://www.curseforge.com/minecraft/mc-mods/passthrough-signs)
+- [ReAuth](https://www.curseforge.com/minecraft/mc-mods/reauth)
+- Immersive Engineering [\#323](https://github.com/NillerMedDild/Enigmatica4/issues/323)
+- EnderChests [\#318](https://github.com/NillerMedDild/Enigmatica4/issues/318)
+- Extreme Sound Muffler [\#316](https://github.com/NillerMedDild/Enigmatica4/issues/316)
+- Rats [\#303](https://github.com/NillerMedDild/Enigmatica4/issues/303)
+- EnderTanks [\#222](https://github.com/NillerMedDild/Enigmatica4/issues/222)
+
+**Removed Mods**
+
+* AuthMe (Replaced with ReAuth)
+
+**Changes**
+
+* Re-do Default Keybindings [\#328](https://github.com/NillerMedDild/Enigmatica4/issues/328)
+
+**Fixed bugs**
+
+- Linux servers not starting: Typo in Enigmatica4Server-0.4.10 server-start.sh [\#327](https://github.com/NillerMedDild/Enigmatica4/issues/327)
+- Iron Plates [\#314](https://github.com/NillerMedDild/Enigmatica4/issues/314)
+
 ## Enigmatica 4 v0.4.10
 
 *Forge-1.14.4-28.2.3*

config/apotheosis/deadly.cfg

@@ -270,6 +270,39 @@ general {
 
     #  [range: 0 ~ 50, default: 1]
     I:"quark:wrapped"=1
+
+    #  [range: 0 ~ 50, default: 1]
+    I:"rats:black_death"=1
+
+    #  [range: 0 ~ 50, default: 1]
+    I:"rats:dutchrat"=1
+
+    #  [range: 0 ~ 50, default: 1]
+    I:"rats:feral_ratlantean"=1
+
+    #  [range: 0 ~ 50, default: 1]
+    I:"rats:ghost_pirat"=1
+
+    #  [range: 0 ~ 50, default: 1]
+    I:"rats:neo_ratlantean"=1
+
+    #  [range: 0 ~ 50, default: 1]
+    I:"rats:pied_piper"=1
+
+    #  [range: 0 ~ 50, default: 1]
+    I:"rats:pirat"=1
+
+    #  [range: 0 ~ 50, default: 1]
+    I:"rats:plague_beast"=1
+
+    #  [range: 0 ~ 50, default: 1]
+    I:"rats:plague_cloud"=1
+
+    #  [range: 0 ~ 50, default: 1]
+    I:"rats:ratlantean_automaton"=1
+
+    #  [range: 0 ~ 50, default: 1]
+    I:"rats:ratlantean_spirit"=1
     I:"silentgems:chaos_wisp"=1
     I:"silentgems:corrupted_slime"=1
     I:"silentgems:ender_slime"=1

config/create-client.toml

@@ -1,6 +1,16 @@
 
-#Client-only settings - If you're looking for server/common settings, look inside your worlds serverconfig folder!
+#
+#Client-only settings - If you're looking for general settings, look inside your worlds serverconfig folder!
 [client]
+	#
+	#Range: 0.0 ~ 1.0
+	fanParticleDensity = 0.5
+	#
+	#Log a stack-trace when rendering issues happen within a moving contraption.
+	explainRenderErrors = false
+	#
+	#Show colourful debug information while the F3-Menu is open.
+	enableRainbowDebug = true
 	#
 	#Show item descriptions on Shift and controls on Ctrl.
 	enableTooltips = true

config/create-common.toml

@@ -0,0 +1,161 @@
+
+#
+#Modify Create's impact on your terrain
+[world]
+	#
+	#Prevents all worldgen added by Create from taking effect
+	disableWorldGen = false
+
+	[world.copper_ore]
+		#
+		#Range: > 0
+		minHeight = 40
+		#
+		#Range: > 0
+		clusterCount = 1
+		#
+		#Range: > 0
+		maxHeight = 96
+		#
+		#Whether to spawn this in your World
+		enable = true
+		#
+		#Range: > 0
+		clusterSize = 21
+
+	[world.weathered_limestone]
+		#
+		#Range: > 0
+		minHeight = 10
+		#
+		#Range: 0.0 ~ 1.0
+		clusterChance = 0.03125
+		#
+		#Range: > 0
+		maxHeight = 30
+		#
+		#Whether to spawn this in your World
+		enable = true
+		#
+		#Range: > 0
+		clusterSize = 128
+
+	[world.zinc_ore]
+		#
+		#Range: > 0
+		minHeight = 55
+		#
+		#Range: > 0
+		clusterCount = 1
+		#
+		#Range: > 0
+		maxHeight = 80
+		#
+		#Whether to spawn this in your World
+		enable = true
+		#
+		#Range: > 0
+		clusterSize = 17
+
+	[world.zinc_ore_desert]
+		#
+		#Range: > 0
+		minHeight = 50
+		#
+		#Range: > 0
+		clusterCount = 5
+		#
+		#Range: > 0
+		maxHeight = 85
+		#
+		#Whether to spawn this in your World
+		enable = true
+		#
+		#Range: > 0
+		clusterSize = 17
+
+	[world.limestone]
+		#
+		#Range: > 0
+		minHeight = 30
+		#
+		#Range: 0.0 ~ 1.0
+		clusterChance = 0.03125
+		#
+		#Range: > 0
+		maxHeight = 70
+		#
+		#Whether to spawn this in your World
+		enable = true
+		#
+		#Range: > 0
+		clusterSize = 128
+
+	[world.dolomite]
+		#
+		#Range: > 0
+		minHeight = 20
+		#
+		#Range: 0.0 ~ 1.0
+		clusterChance = 0.015625
+		#
+		#Range: > 0
+		maxHeight = 70
+		#
+		#Whether to spawn this in your World
+		enable = true
+		#
+		#Range: > 0
+		clusterSize = 128
+
+	[world.copper_ore_ocean]
+		#
+		#Range: > 0
+		minHeight = 20
+		#
+		#Range: > 0
+		clusterCount = 4
+		#
+		#Range: > 0
+		maxHeight = 55
+		#
+		#Whether to spawn this in your World
+		enable = true
+		#
+		#Range: > 0
+		clusterSize = 15
+
+	[world.gabbro]
+		#
+		#Range: > 0
+		minHeight = 20
+		#
+		#Range: 0.0 ~ 1.0
+		clusterChance = 0.015625
+		#
+		#Range: > 0
+		maxHeight = 70
+		#
+		#Whether to spawn this in your World
+		enable = true
+		#
+		#Range: > 0
+		clusterSize = 128
+
+	[world.scoria]
+		#
+		#Range: > 0
+		minHeight = 0
+		#
+		#Range: 0.0 ~ 1.0
+		clusterChance = 0.03125
+		#
+		#Range: > 0
+		maxHeight = 10
+		#
+		#Whether to spawn this in your World
+		enable = true
+		#
+		#Range: > 0
+		clusterSize = 128
+