From 92c14aca89be0c585a3d478678357499f022d13f Mon Sep 17 00:00:00 2001
From: Xikaro <0regon.end@gmail.com>
Date: Wed, 24 Jan 2024 12:08:36 +0500
Subject: [PATCH] all update

---
 config/craftpresence.json          |  2 +-
 config/jade/sort-order.json        |  8 ++++----
 config/moonlight-common.toml       |  1 +
 config/playerrevive.json           |  3 ++-
 config/tfcastikorcarts-common.toml | 13 +++++++++++++
 kubejs/config/probejs.json         | 23 +++++++++++------------
 mods                               |  2 +-
 7 files changed, 33 insertions(+), 19 deletions(-)
 create mode 100644 config/moonlight-common.toml

diff --git a/config/craftpresence.json b/config/craftpresence.json
index 5c2bb7973..147ae52ba 100644
--- a/config/craftpresence.json
+++ b/config/craftpresence.json
@@ -150,7 +150,7 @@
     "stripTranslationColors": false,
     "stripExtraGuiElements": false,
     "renderTooltips": true,
-    "configKeyCode": 0
+    "configKeyCode": -1
   },
   "displaySettings": {
     "presenceData": {
diff --git a/config/jade/sort-order.json b/config/jade/sort-order.json
index 6fa827b56..df5164d44 100644
--- a/config/jade/sort-order.json
+++ b/config/jade/sort-order.json
@@ -207,10 +207,6 @@
   "tfc:ocelot": null,
   "tfc:rabbit": null,
   "tfc:fishing_hook": null,
-  "gtceu:electric_container_provider": null,
-  "gtceu:workable_provider": null,
-  "gtceu:controllable_provider": null,
-  "gtceu:recipe_logic_provider": null,
   "minecraft:brewing_stand": null,
   "minecraft:beehive": null,
   "minecraft:command_block": null,
@@ -267,6 +263,10 @@
   "ae2:part_icon": null,
   "ae2:part_tooltip": null,
   "ae2:part_mod_name": null,
+  "gtceu:electric_container_provider": null,
+  "gtceu:workable_provider": null,
+  "gtceu:controllable_provider": null,
+  "gtceu:recipe_logic_provider": null,
   "treetap:tap": null,
   "firmalife:drying_mat": null,
   "firmalife:solar_drier": null,
diff --git a/config/moonlight-common.toml b/config/moonlight-common.toml
new file mode 100644
index 000000000..8b1378917
--- /dev/null
+++ b/config/moonlight-common.toml
@@ -0,0 +1 @@
+
diff --git a/config/playerrevive.json b/config/playerrevive.json
index 421db88fc..afd498e27 100644
--- a/config/playerrevive.json
+++ b/config/playerrevive.json
@@ -23,7 +23,8 @@
     "disableOtherDamage": false,
     "hasShaderEffect": true,
     "changePermissionLevel": false,
-    "permissionLevel": 0
+    "permissionLevel": 0,
+    "canBePushed": true
   },
   "revive": {
     "requiredReviveProgress": 100.0,
diff --git a/config/tfcastikorcarts-common.toml b/config/tfcastikorcarts-common.toml
index ff4a7b8e5..d4a31bda7 100644
--- a/config/tfcastikorcarts-common.toml
+++ b/config/tfcastikorcarts-common.toml
@@ -14,4 +14,17 @@
 	#
 	# Can the animal cart pick up water animals?
 	canCarryWaterEntities = true
+	#
+	# A very heavy huge item has a combined weight/size factor of 35, thus if a threshold is 140, then the player can carry 4 items.
+	# Threshold at which the player carrying a cart will get exhausted. Higher => can carry more.
+	#Range: 0.0 ~ 1.7976931348623157E308
+	exhaustedThreshold = 140.0
+	#
+	# Threshold at which the player carrying a cart will get overburdened. Higher => can carry more.
+	#Range: 0.0 ~ 1.7976931348623157E308
+	overburdenedThreshold = 280.0
+	#
+	# Threshold at which the player carrying a cart will get pinned. Higher => can carry more.
+	#Range: 0.0 ~ 1.7976931348623157E308
+	pinnedThreshold = 420.0
 
diff --git a/kubejs/config/probejs.json b/kubejs/config/probejs.json
index b9897fa44..d309318df 100644
--- a/kubejs/config/probejs.json
+++ b/kubejs/config/probejs.json
@@ -1,14 +1,13 @@
 {
-  "firstLoad": false,
-  "noAggressiveProbing": true,
-  "docsTimestamp": 1704370339573,
-  "allowRegistryObjectDumps": true,
-  "allowRegistryLiteralDumps": true,
-  "requireSingleAndPerm": true,
-  "enabled": true,
-  "modChanged": false,
-  "disableRecipeJsonDump": true,
-  "dumpJSONIntermediates": false,
-  "pullSchema": false,
-  "version": 1
+  "version": 2,
+  "Is ProbeJS Loaded for First Time in the Modpack - Configured by ProbeJS Itself": false,
+  "The Timestamp of ProbeJS Remote Documents - Configured by ProbeJS Itself": 1704370339573,
+  "Disable Aggressive Mode for ProbeJS Dumps": true,
+  "Allow ProbeJS to Resolve Classes from Registries Like Item Classes or Block Classes": true,
+  "Allow ProbeJS to Generate Literal Types for Item/Block/etc. IDs": true,
+  "Should ProbeJS Only Show Command in Single Player and with Cheat Enabled": true,
+  "Should ProbeJS be Generally Enabled": true,
+  "Disable the Recipe JSON Snippet Generation for ProbeJS triggered by `#`": true,
+  "Should ProbeJS Generate Intermediate JSON Representation of Documents - Mostly for Debugging": false,
+  "Should ProbeJS Download Schema Scripts from Github for Mods without Addon Supports": false
 }
\ No newline at end of file
diff --git a/mods b/mods
index 03fa8df17..5df7c751d 160000
--- a/mods
+++ b/mods
@@ -1 +1 @@
-Subproject commit 03fa8df176689e9c74d670d127fab6be6fd467c6
+Subproject commit 5df7c751df9a1389d93e3ebe0b178c2e12216179