Updated client modpack to reflect server mod changes.

Jenkinsfile

@@ -27,8 +27,8 @@ pipeline {
                 branch "**/master"
             }
             steps {
-                publishHTML([allowMissing: false, alwaysLinkToLastBuild: false, keepAll: false, reportDir: 'curseforge', reportFiles: 'modlist.html', reportName: 'Mod List', reportTitles: ''])
-                zip archive: true, dir: 'curseforge', exclude: '', glob: '', overwrite: true, zipFile: 'publish/RSEMCM.zip'
+                publishHTML([allowMissing: false, alwaysLinkToLastBuild: false, keepAll: false, reportDir: 'client', reportFiles: 'modlist.html', reportName: 'Mod List', reportTitles: ''])
+                zip archive: true, dir: 'client', exclude: '', glob: '', overwrite: true, zipFile: 'publish/RSEMCM.zip'
                 zip archive: true, dir: 'server', exclude: '', glob: '', overwrite: true, zipFile: 'publish/RSEMCM_server.zip'
             }
         }

client/manifest.json

@@ -11,7 +11,7 @@
   "manifestType": "minecraftModpack",
   "manifestVersion": 1,
   "name": "RSEMCM",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "author": "",
   "files": [
     {
@@ -56,7 +56,7 @@
     },
     {
       "projectID": 618298,
-      "fileID": 3793531,
+      "fileID": 3809348,
       "required": true
     },
     {
@@ -66,12 +66,12 @@
     },
     {
       "projectID": 574300,
-      "fileID": 3797910,
+      "fileID": 3807443,
       "required": true
     },
     {
       "projectID": 583228,
-      "fileID": 3753584,
+      "fileID": 3805271,
       "required": true
     },
     {
@@ -106,7 +106,7 @@
     },
     {
       "projectID": 268560,
-      "fileID": 3743835,
+      "fileID": 3810540,
       "required": true
     },
     {
@@ -114,6 +114,11 @@
       "fileID": 3725501,
       "required": true
     },
+    {
+      "projectID": 361026,
+      "fileID": 3809335,
+      "required": true
+    },
     {
       "projectID": 551520,
       "fileID": 3750013,
@@ -121,7 +126,7 @@
     },
     {
       "projectID": 268566,
-      "fileID": 3743837,
+      "fileID": 3810542,
       "required": true
     },
     {
@@ -136,7 +141,12 @@
     },
     {
       "projectID": 422301,
-      "fileID": 3796638,
+      "fileID": 3807524,
+      "required": true
+    },
+    {
+      "projectID": 300331,
+      "fileID": 3741435,
       "required": true
     },
     {
@@ -254,6 +264,11 @@
       "fileID": 3755665,
       "required": true
     },
+    {
+      "projectID": 239197,
+      "fileID": 3809574,
+      "required": true
+    },
     {
       "projectID": 563928,
       "fileID": 3801033,
@@ -289,9 +304,14 @@
       "fileID": 3575623,
       "required": true
     },
+    {
+      "projectID": 313866,
+      "fileID": 3773562,
+      "required": true
+    },
     {
       "projectID": 419699,
-      "fileID": 3801525,
+      "fileID": 3807924,
       "required": true
     },
     {
@@ -356,7 +376,7 @@
     },
     {
       "projectID": 377448,
-      "fileID": 3751153,
+      "fileID": 3807783,
       "required": true
     },
     {
@@ -391,7 +411,7 @@
     },
     {
       "projectID": 306770,
-      "fileID": 3729975,
+      "fileID": 3809917,
       "required": true
     },
     {
@@ -431,7 +451,7 @@
     },
     {
       "projectID": 531834,
-      "fileID": 3803388,
+      "fileID": 3806807,
       "required": true
     },
     {
@@ -446,7 +466,7 @@
     },
     {
       "projectID": 342466,
-      "fileID": 3753619,
+      "fileID": 3805799,
       "required": true
     },
     {
@@ -454,14 +474,9 @@
       "fileID": 3697638,
       "required": true
     },
-    {
-      "projectID": 316867,
-      "fileID": 3784685,
-      "required": true
-    },
     {
       "projectID": 223852,
-      "fileID": 3693181,
+      "fileID": 3807626,
       "required": true
     },
     {
@@ -479,6 +494,11 @@
       "fileID": 3785773,
       "required": true
     },
+    {
+      "projectID": 548599,
+      "fileID": 3785792,
+      "required": true
+    },
     {
       "projectID": 272335,
       "fileID": 3804158,
@@ -509,6 +529,11 @@
       "fileID": 3669114,
       "required": true
     },
+    {
+      "projectID": 368718,
+      "fileID": 3735545,
+      "required": true
+    },
     {
       "projectID": 581495,
       "fileID": 3770744,
@@ -516,7 +541,7 @@
     },
     {
       "projectID": 342543,
-      "fileID": 3793418,
+      "fileID": 3808854,
       "required": true
     },
     {

client/modlist.html

@@ -19,11 +19,13 @@
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/ftb-library-forge">FTB Library (Forge) (by FTB)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/mekanism">Mekanism (by bradyaidanc)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/ftb-teams-forge">FTB Teams (Forge) (by FTB)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/occultism">Occultism (by kli_kli)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/better-fps-render-distance">Better Fps - Render Distance[Forge] (by someaddon)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/mekanism-generators">Mekanism Generators (by bradyaidanc)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/cofh-core">CoFH Core (by TeamCoFH)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/thermal-expansion">Thermal Expansion (by TeamCoFH)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/sophisticated-backpacks">Sophisticated Backpacks (by P3pp3rF1y)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/simply-light">Simply Light (by Flanks255)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/rftools-control">RFTools Control (by McJty)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/waystones">Waystones (by BlayTheNinth)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/ding">Ding (by ohaiiChun)</a></li>
@@ -47,6 +49,7 @@
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/curios">Curios API (Forge) (by TheIllusiveC4)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/library-ferret-forge">Library Ferret - Forge (by jtl_elisa)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/immersive-engineering">Immersive Engineering (by BluSunrize)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/crafttweaker">CraftTweaker (by Jaredlll08)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/terrablender">TerraBlender (Forge) (by TheAdubbz)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/productivebees">Productive Bees (by LobsterJonn)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/farmers-delight">Farmer's Delight (by vectorwing)</a></li>
@@ -54,6 +57,7 @@
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/quark">Quark (by Vazkii)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/autoreglib">AutoRegLib (by Vazkii)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/quark-oddities">Quark Oddities (by Vazkii)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/engineers-decor">Engineer's Decor (by wilechaote)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/architectury-api">Architectury API (Fabric/Forge) (by shedaniel)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/ironchests">Iron Chests: Restocked (by ThatGravyBoat)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/mcjtylib">McJtyLib (by McJty)</a></li>
@@ -87,17 +91,18 @@
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/runelic">Runelic (by DarkhaxDev)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/rftools-utility">RFTools Utility (by McJty)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/decorative-blocks">Decorative Blocks (by stohun)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/electrodynamics">Electrodynamics (by aurilisdev)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/storage-drawers">Storage Drawers (by Texelsaur)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/chisels-bits">Chisels & Bits - For Forge (by AlgorithmX2)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/awesome-dungeon-forge">Awesome Dungeon - Forge (by jtl_elisa)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/geckolib">GeckoLib (by ThanosGecko)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/hexerei">Hexerei (by JoeFoxe)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/cucumber">Cucumber Library (by BlakeBr0)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/citadel">Citadel (by sbom_xela)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/pipez">Pipez (by henkelmax)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/supermartijn642s-config-lib">SuperMartijn642's Config Lib (by SuperMartijn642)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/the-undergarden">The Undergarden (by Quek04)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/feature-nbt-deadlock-be-gone">Feature NBT Deadlock Be Gone (by telepathicgrunt)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/jeitweaker">JEITweaker (by Jaredlll08)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/oculus">Oculus (by Asek3)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/mahou-tsukai">Mahou Tsukai (by stepcros)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/tinkers-construct">Tinkers Construct (by mDiyo)</a></li>

client/overrides/config/Advancedperipherals/general.toml

@@ -0,0 +1,13 @@
+
+#Config to adjust general mod settings
+[General]
+	#Enable the debug mode. You should only enable it, if a developer says it or something does not work.
+	enableDebugMode = false
+
+[Core]
+	#Enables initial cooldown on peripheral initialization
+	isInitialCooldownEnabled = true
+	#Determinates initial cooldown sensentive level, values lower then this value will not trigger initial cooldown
+	#Range: > 0
+	initialCooldownSensetiveLevel = 6000
+

client/overrides/config/Advancedperipherals/metaphysics.toml

@@ -0,0 +1,32 @@
+
+#Config for metaphysics
+[Metaphysics]
+	#Defines energy to fuel rate
+	#Range: > 575
+	energyToFuelRate = 575
+	enableWeakAutomataCore = true
+	enableEndAutomataCore = true
+	enableHusbandryAutomataCore = true
+	#Defines max warp point stored in warp core. Mostly need to not allow NBT overflow error
+	#Range: > 1
+	endAutomataCoreWarpPointLimit = 64
+	#Chance that overpowered automata will break after rotation cycle
+	#Range: 0.0 ~ 1.0
+	overpoweredAutomataBreakChance = 0.002
+	#Range: 1 ~ 64
+	tier1AutomataCoreInteractionRadius = 2
+	#Range: 1 ~ 32
+	tier1AutomataCoreMaxFuelConsumptionRate = 2
+	#Range: 1 ~ 64
+	tier2AutomataCoreInteractionRadius = 4
+	#Range: 1 ~ 32
+	tier2AutomataCoreMaxFuelConsumptionRate = 3
+	#Range: 1 ~ 64
+	overpoweredTier1AutomataCoreInteractionRadius = 4
+	#Range: 1 ~ 32
+	overpoweredTier1AutomataCoreMaxFuelConsumptionRate = 3
+	#Range: 1 ~ 64
+	overpoweredTier2AutomataCoreInteractionRadius = 6
+	#Range: 1 ~ 32
+	overpoweredTier2AutomataCoreMaxFuelConsumptionRate = 4
+

client/overrides/config/Advancedperipherals/peripherals.toml

@@ -0,0 +1,139 @@
+
+#Peripherals config
+[Peripherals]
+
+	[Peripherals.Player_Detector]
+		#Enable the Player Detector or not.
+		enablePlayerDetector = true
+		#The max range of the player detector functions. If anyone use a higher range, the detector will use this max range
+		#Range: 0 ~ 100000000
+		playerDetMaxRange = 100000000
+		#Activates the "getPlayerPos" function of the Player Detector
+		enablePlayerPosFunction = true
+		#Adds more information to `getPlayerPos` of the Player Detector. Like rotation and dimension
+		morePlayerInformation = true
+
+	[Peripherals.Energy_Detector]
+		#Enable the Energy Detector or not.
+		enableEnergyDetector = true
+		#Defines the maximum energy flow of the energy detector.
+		#Range: > 1
+		energyDetectorMaxFlow = 2147483647
+
+	[Peripherals.NBT_Storage]
+		#Enable the nbt storage block or not
+		enableNBTStorage = true
+		#Defines max nbt string length that can be stored in nbt storage
+		#Range: > 0
+		nbtStorageMaxSize = 1048576
+
+	[Peripherals.Chunky_Turtle]
+		#Enable the Chunky Turtle or not.
+		enableChunkyTurtle = true
+		#Time in seconds, while loaded chunk can be consider as valid without touch
+		#Range: > 60
+		chunkLoadValidTime = 600
+
+	[Peripherals.Chat_Box]
+		#Enable the Chat Box or not.
+		enableChatBox = true
+		#Defines default chatbox prefix
+		defaultChatBoxPrefix = "AP"
+
+	[Peripherals.ME_Bridge]
+		#Enable the Me Bridge or not.
+		enableMeBridge = true
+		#Power consumption per tick.
+		#Range: > 0
+		mePowerConsumption = 10
+
+	[Peripherals.RS_Bridge]
+		#Enable the Rs Bridge or not.
+		enableRsBridge = true
+		#Power consumption per tick.
+		#Range: > 0
+		rsPowerConsumption = 10
+
+	[Peripherals.Environment_Detector]
+		#Enable the Environment Detector or not.
+		enableEnvironmentDetector = true
+
+	[Peripherals.AR_Controller]
+		#Enable the AR goggles or not.
+		enableARGoggles = true
+
+	[Peripherals.Inventory_Manager]
+		#Enable the inventory manager or not.
+		enableInventoryManager = true
+
+	[Peripherals.Redstone_Integrator]
+		#Enable the redstone integrator or not.
+		enableRedstoneIntegrator = true
+
+	[Peripherals.Block_Reader]
+		#Enable the block reader or not.
+		enableBlockReader = true
+
+	[Peripherals.Geo_Scanner]
+		#Enable the geo scanner or not.
+		enableGeoScanner = true
+
+	[Peripherals.Colony_Integrator]
+		#Enable the colony integrator or not.
+		enableColonyIntegrator = true
+
+	[Peripherals.Compass_Turtle]
+		#Enable the compass turtle or not.
+		enableCompassTurtle = true
+
+	[Peripherals.Powered_Peripherals]
+		#Enable RF storage for peripherals, that could use it
+		enablePoweredPeripherals = false
+		#Defines max energy storage in any powered peripheral
+		#Range: > 1000000
+		poweredPeripheralMaxEnergyStored = 100000000
+
+	[Peripherals.Operations]
+		#Range: > 1000
+		digCooldown = 1000
+		#Range: > 0
+		digCost = 1
+		#Range: > 1000
+		useOnBlockCooldown = 5000
+		#Range: > 0
+		useOnBlockCost = 1
+		#Range: > 1000
+		suckCooldown = 1000
+		#Range: > 0
+		suckCost = 1
+		#Range: > 1000
+		useOnAnimalCooldown = 2500
+		#Range: > 0
+		useOnAnimalCost = 10
+		#Range: > 1000
+		captureAnimalCooldown = 50000
+		#Range: > 0
+		captureAnimalCost = 100
+		#Range: > 1000
+		warpCooldown = 1000
+		#Range: > 0
+		warpCost = 1
+		#Range: > 1000
+		scanBlocksCooldown = 2000
+		#Range: 1 ~ 64
+		scanBlocksMaxFreeRadius = 8
+		#Range: 1 ~ 64
+		scanBlocksMaxCostRadius = 16
+		#Range: 0.1 ~ 1.7976931348623157E308
+		scanBlocksExtraBlockCost = 0.17
+		#Range: > 1000
+		scanEntitiesCooldown = 2000
+		#Range: 1 ~ 64
+		scanEntitiesMaxFreeRadius = 8
+		#Range: 1 ~ 64
+		scanEntitiesMaxCostRadius = 16
+		#Range: 0.1 ~ 1.7976931348623157E308
+		scanEntitiesExtraBlockCost = 0.17
+		#Range: > 1000
+		chatMessageCooldown = 1000
+

client/overrides/config/Advancedperipherals/world.toml

@@ -0,0 +1,11 @@
+
+#Config to adjust world settings
+[World]
+	#Enable the villager structures for the computer scientist.
+	enableVillagerStructures = true
+	#Gives the ap documentation to new players on a world.
+	givePlayerBookOnJoin = true
+	#The weight of the villager structures
+	#Range: 0 ~ 16000
+	villagerStructureWeight = 10
+

client/overrides/config/Mekanism/client.toml

@@ -95,7 +95,7 @@
 				y = 2147483647
 
 			[client.gui.window.sideConfig]
-				x = 10
+				x = 9
 				y = 15
 
 			[client.gui.window.transporterConfig]
@@ -104,7 +104,7 @@
 
 			[client.gui.window.upgrade]
 				x = 10
-				y = 15
+				y = -102
 
 	#QIO Config
 	[client.qio]

client/overrides/config/additional-additions-config.json

@@ -1,5 +1,5 @@
 {
-  "version": 6,
+  "version": 7,
   "FoodItems": {
     "FriedEgg": true,
     "BerryPie": true,
@@ -12,7 +12,6 @@
   "EnchantmentSpeed": true,
   "Wrench": true,
   "CopperPatina": true,
-  "AmethystLamp": true,
   "Crossbows": true,
   "TridentShard": true,
   "GlowStick": true,
@@ -35,5 +34,9 @@
     "duration": 5
   },
   "HastePotions": true,
-  "BundleRecipe": true
+  "BundleRecipe": true,
+  "AmethystLamp": {
+    "enabled": true,
+    "despawnChance": 0.5
+  }
 }

client/overrides/config/ae2-client.toml

@@ -24,5 +24,5 @@
 		#Allowed Values: TALL, FULL, SMALL
 		terminalStyle = "TALL"
 		#Allowed Values: DEFAULT, REMEMBER_SEARCH, AUTO_FOCUS, AUTO_FOCUS_AND_REMEMBER_SEARCH, JEI, REI
-		terminalSearchMode = "JEI"
+		terminalSearchMode = "REMEMBER_SEARCH"