Segmented End City treasure to guarantee drops

I have not tested for balance, but it'll still be better than it was last week

CHANGELOG.md

@@ -5,6 +5,27 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [Unreleased]
+
+### Fixed
+
+- *Actually* removed some leftover Tinkers' Contruct functional blocks
+
+## [1.2.0] - 2026-01-24
+
+### Added
+
+- Backported name tag recipe
+
+### Fixed
+
+- Attempted to remove some leftover Tinkers' Contruct functional blocks
+- Removed Tinkers' Construct swasher item from fishing loot table
+
+### Removed
+
+- Removed the redundant Tinkers' Construct JEI integration mod
+
 ## [1.1.3] - 2026-01-16
 
 ### Added
@@ -89,7 +110,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 Initial release
 
-[unreleased]: https://patience.nearmisses.xyz/SergeantAcoustic/tinkers_tinkering/compare/1.1.3...HEAD
+[unreleased]: https://patience.nearmisses.xyz/SergeantAcoustic/tinkers_tinkering/compare/1.2.0...HEAD
+[1.2.0]: https://patience.nearmisses.xyz/SergeantAcoustic/tinkers_tinkering/compare/1.1.3...1.2.0
 [1.1.3]: https://patience.nearmisses.xyz/SergeantAcoustic/tinkers_tinkering/compare/1.1.2...1.1.3
 [1.1.2]: https://patience.nearmisses.xyz/SergeantAcoustic/tinkers_tinkering/compare/1.1.1...1.1.2
 [1.1.1]: https://patience.nearmisses.xyz/SergeantAcoustic/tinkers_tinkering/compare/1.1.0...1.1.1

README.md

@@ -1,4 +1,4 @@
-# Minecraft Rebalanced
+# Minecraft Rebalanced - [Changelog](CHANGELOG.md)
 
 A modpack intended to rework almost every feature in the game with a focus on the vanilla progression.
 

modrinth.index.json

@@ -6,7 +6,7 @@
   "formatVersion": 1,
   "game": "minecraft",
   "name": "MC Rebalanced",
-  "versionId": "1.1.3",
+  "versionId": "1.2.0",
   "files": [
     {
       "downloads": [
@@ -1568,21 +1568,6 @@
       },
       "path": "mods/swampier_swamps-forge-1.20-4.0.0.jar"
     },
-    {
-      "downloads": [
-        "https://cdn.modrinth.com/data/DhBtjMiv/versions/r2UoKjoQ/tconjei-1.20.1-1.5.0.jar"
-      ],
-      "env": {
-        "client": "required",
-        "server": "unsupported"
-      },
-      "fileSize": 42411,
-      "hashes": {
-        "sha1": "ace07009488cb4251e522247d78de438253decac",
-        "sha512": "ae8d600b2ce4e2da89ce8cad3ae24e46182cc19abf9ca9f2f54bd94e4eaa5ec28c8107983b4b0fd7bb93edb4aa89fe59a19cb59ae3002fc32072dfa71c920a7f"
-      },
-      "path": "mods/tconjei-1.20.1-1.5.0.jar"
-    },
     {
       "downloads": [
         "https://cdn.modrinth.com/data/YP9DjOvN/versions/vLphnHrj/tetra-1.20.1-6.10.1.jar"

overrides/config/item_obliterator.json5

@@ -17,14 +17,14 @@
   //    Example: minecraft:diamond
   "blacklisted_items": [
 	"paxelsfordummies:golden_paxel",
-    "advanced_copper:copper_axe",
+	"advanced_copper:copper_axe",
-    "advanced_copper:copper_hammer",
+	"advanced_copper:copper_hammer",
-    "advanced_copper:copper_hoe",
+	"advanced_copper:copper_hoe",
-    "advanced_copper:copper_paxel",
+	"advanced_copper:copper_paxel",
-    "advanced_copper:copper_pickaxe",
+	"advanced_copper:copper_pickaxe",
-    "advanced_copper:copper_shovel",
+	"advanced_copper:copper_shovel",
-    "advanced_copper:copper_sword",
+	"advanced_copper:copper_sword",
-    "advanced_copper:copper_excavator",
+	"advanced_copper:copper_excavator",
 	"tconstruct:repair_kit",
 	"tconstruct:repair_kit_cast",
 	"tconstruct:repair_kit_sand_cast",
@@ -182,7 +182,9 @@
 	"tconstruct:cast_chest",
 	"tconstruct:seared_casting_tank",
 	"tconstruct:scorched_proxy_tank",
-
+	"tconstruct:scorched_alloyer",
+	"tconstruct:seared_heater",
+	"tconstruct:seared_chute"
   ],
   // -----------------------------------------------------------
   // Removes an item if it contains certain nbt tag. If the whole entry (or expression) is present, the item gets removed.

overrides/config/tconjei-client.toml

@@ -1,3 +0,0 @@
-#Enable tooltip under Tinker's materials
-enable_tooltip = false
-

overrides/global_packs/required_data/mc_rebalance_datapack/data/mc_rebalance/recipes/name_tag.json

@@ -0,0 +1,21 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "category": "equipment",
+  "key": {
+    "P": {
+      "item": "minecraft:paper"
+    },
+    "N": {
+      "tag": "c:nuggets"
+    }
+  },
+  "pattern": [
+    " N",
+    "P "
+  ],
+  "result": {
+    "count": 1,
+    "item": "minecraft:name_tag"
+  },
+  "show_notification": true
+}

overrides/global_packs/required_data/mc_rebalance_datapack/data/minecraft/loot_tables/chests/end_city_treasure.json

@@ -1,202 +1,210 @@
 {
-	"pools":[{
+	"pools":[
-		"rolls": {"min":10,"max":16},
+		{
-		"entries":[
+			"rolls": {"min":2,"max":4},
-			{
+			"entries":[
-				"type":"item",
+				{
-				"name":"minecraft:beetroot_seeds",
+					"type":"item",
-				"weight":1
+					"name":"minecraft:beetroot_seeds",
-			},
+					"weight":1
-			{
+				},
-				"type":"item",
+				{
-				"name":"minecraft:diamond",
+					"type":"item",
-				"functions":[{
+					"name":"minecraft:diamond",
-					"function":"minecraft:set_count",
+					"functions":[{
-					"count": {"type":"minecraft:uniform","min":2,"max":7}
+						"function":"minecraft:set_count",
-				}],
+						"count": {"type":"minecraft:uniform","min":2,"max":5}
-				"weight":15
+					}],
-			},
+					"weight":15
-			{
+				},
-				"type":"item",
+				{
-				"name":"minecraft:netherite_scrap",
+					"type":"item",
-				"functions":[{
+					"name":"minecraft:netherite_scrap",
-					"function":"minecraft:set_count",
+					"functions":[{
-					"count": {"type":"minecraft:uniform","min":1,"max":2}
+						"function":"minecraft:set_count",
-				}],
+						"count": {"type":"minecraft:uniform","min":1,"max":2}
-				"weight":18
+					}],
-			},
+					"weight":18
-			{
+				}
-				"type":"item",
+			]
-				"name":"minecraft:diamond_sword",
+		},
-				"functions":[{
+		{
-					"function":"enchant_with_levels",
+			"rolls":{"min":0, "max":2},
-					"treasure":true,
+			"entries":[
-					"levels": {"min":25,"max":40}
+				{
-				}],
+					"type":"item",
-				"weight":2
+					"name":"minecraft:diamond_sword",
-			},
+					"functions":[{
-			{
+						"function":"enchant_with_levels",
-				"type":"item",
+						"treasure":true,
-				"name":"minecraft:diamond_boots",
+						"levels": {"min":25,"max":40}
-				"functions":[{
+					}],
-					"function":"enchant_with_levels",
+					"weight":2
-					"treasure":true,
+				},
-					"levels": {"min":25,"max":40}
+				{
-				}],
+					"type":"item",
-				"weight":2
+					"name":"minecraft:diamond_boots",
-			},
+					"functions":[{
-			{
+						"function":"enchant_with_levels",
-				"type":"item",
+						"treasure":true,
-				"name":"minecraft:diamond_chestplate",
+						"levels": {"min":25,"max":40}
-				"functions":[{
+					}],
-					"function":"enchant_with_levels",
+					"weight":2
-					"treasure":true,
+				},
-					"levels": {"min":25,"max":40}
+				{
-				}],
+					"type":"item",
-				"weight":2
+					"name":"minecraft:diamond_chestplate",
-			},
+					"functions":[{
-			{
+						"function":"enchant_with_levels",
-				"type":"item",
+						"treasure":true,
-				"name":"minecraft:diamond_helmet",
+						"levels": {"min":25,"max":40}
-				"functions":[{
+					}],
-					"function":"enchant_with_levels",
+					"weight":2
-					"treasure":true,
+				},
-					"levels": {"min":25,"max":40}
+				{
-				}],
+					"type":"item",
-				"weight":2
+					"name":"minecraft:diamond_helmet",
-			},
+					"functions":[{
-			{
+						"function":"enchant_with_levels",
-				"type":"item",
+						"treasure":true,
-				"name":"minecraft:diamond_leggings",
+						"levels": {"min":25,"max":40}
-				"functions":[{
+					}],
-					"function":"enchant_with_levels",
+					"weight":2
-					"treasure":true,
+				},
-					"levels": {"min":25,"max":40}
+				{
-				}],
+					"type":"item",
-				"weight":2
+					"name":"minecraft:diamond_leggings",
-			},
+					"functions":[{
-			{
+						"function":"enchant_with_levels",
-				"type":"item",
+						"treasure":true,
-				"name":"minecraft:diamond_pickaxe",
+						"levels": {"min":25,"max":40}
-				"functions":[{
+					}],
-					"function":"enchant_with_levels",
+					"weight":2
-					"treasure":true,
+				},
-					"levels": {"min":25,"max":40}
+				{
-				}],
+					"type":"item",
-				"weight":2
+					"name":"minecraft:diamond_pickaxe",
-			},
+					"functions":[{
-
+						"function":"enchant_with_levels",
-			{
+						"treasure":true,
-				"type":"item",
+						"levels": {"min":25,"max":40}
-				"name":"minecraft:netherite_sword",
+					}],
-				"functions":[{
+					"weight":2
-					"function":"enchant_with_levels",
+				},
-					"treasure":true,
+	
-					"levels": {"min":10,"max":30}
+				{
-				}],
+					"type":"item",
-				"weight":2
+					"name":"minecraft:netherite_sword",
-			},
+					"functions":[{
-			{
+						"function":"enchant_with_levels",
-				"type":"item",
+						"treasure":true,
-				"name":"minecraft:netherite_boots",
+						"levels": {"min":10,"max":30}
-				"functions":[{
+					}],
-					"function":"enchant_with_levels",
+					"weight":2
-					"treasure":true,
+				},
-					"levels": {"min":10,"max":30}
+				{
-				}],
+					"type":"item",
-				"weight":2
+					"name":"minecraft:netherite_boots",
-			},
+					"functions":[{
-			{
+						"function":"enchant_with_levels",
-				"type":"item",
+						"treasure":true,
-				"name":"minecraft:netherite_chestplate",
+						"levels": {"min":10,"max":30}
-				"functions":[{
+					}],
-					"function":"enchant_with_levels",
+					"weight":2
-					"treasure":true,
+				},
-					"levels": {"min":10,"max":30}
+				{
-				}],
+					"type":"item",
-				"weight":2
+					"name":"minecraft:netherite_chestplate",
-			},
+					"functions":[{
-			{
+						"function":"enchant_with_levels",
-				"type":"item",
+						"treasure":true,
-				"name":"minecraft:netherite_helmet",
+						"levels": {"min":10,"max":30}
-				"functions":[{
+					}],
-					"function":"enchant_with_levels",
+					"weight":2
-					"treasure":true,
+				},
-					"levels": {"min":10,"max":30}
+				{
-				}],
+					"type":"item",
-				"weight":2
+					"name":"minecraft:netherite_helmet",
-			},
+					"functions":[{
-			{
+						"function":"enchant_with_levels",
-				"type":"item",
+						"treasure":true,
-				"name":"minecraft:netherite_leggings",
+						"levels": {"min":10,"max":30}
-				"functions":[{
+					}],
-					"function":"enchant_with_levels",
+					"weight":2
-					"treasure":true,
+				},
-					"levels": {"min":10,"max":30}
+				{
-				}],
+					"type":"item",
-				"weight":2
+					"name":"minecraft:netherite_leggings",
-			},
+					"functions":[{
-			{
+						"function":"enchant_with_levels",
-				"type":"item",
+						"treasure":true,
-				"name":"minecraft:netherite_pickaxe",
+						"levels": {"min":10,"max":30}
-				"functions":[{
+					}],
-					"function":"enchant_with_levels",
+					"weight":2
-					"treasure":true,
+				},
-					"levels": {"min":10,"max":30}
+				{
-				}],
+					"type":"item",
-				"weight":2
+					"name":"minecraft:netherite_pickaxe",
-			},
+					"functions":[{
-			{
+						"function":"enchant_with_levels",
-				"type":"item",
+						"treasure":true,
-				"name":"minecraft:diamond_horse_armor",
+						"levels": {"min":10,"max":30}
-				"weight":2
+					}],
-			},
+					"weight":2
-			{
+				},
-				"type":"item",
+				{
-				"name":"minecraft:netherite_upgrade_smithing_template",
+					"type":"item",
-				"functions":[{
+					"name":"minecraft:diamond_horse_armor",
-					"function":"minecraft:set_count",
+					"weight":2
-					"count": {"type":"minecraft:uniform","min":3,"max":8}
+				}
-				}],
+			]
-				"weight":4
+		},
-			},
+		{
-			{
+			"rolls":{"min":2,"max":5},
-				"type":"item",
+			"entries":[
-				"name":"minecraft:purpur_block",
+				{
-				"functions":[{
+					"type":"item",
-					"function":"minecraft:set_count",
+					"name":"minecraft:netherite_upgrade_smithing_template",
-					"count": {"type":"minecraft:uniform","min":10,"max":18}
+					"weight":4
-				}],
+				},
-				"weight":12
+				{
-			},
+					"type":"item",
-			{
+					"name":"minecraft:purpur_block",
-				"type":"item",
+					"functions":[{
-				"name":"minecraft:book",
+						"function":"minecraft:set_count",
-				"functions":[{
+						"count": {"type":"minecraft:uniform","min":10,"max":18}
-					"function":"enchant_with_levels",
+					}],
-					"treasure":true,
+					"weight":12
-					"levels": {"min":10,"max":30}
+				},
-				}],
+				{
-				"weight":6
+					"type":"item",
-			},
+					"name":"minecraft:book",
-			{
+					"functions":[{
-				"type":"item",
+						"function":"enchant_with_levels",
-				"name":"minecraft:phantom_membrane",
+						"treasure":true,
-				"functions":[{
+						"levels": {"min":10,"max":30}
-					"function":"minecraft:set_count",
+					}],
-					"count": {"type":"minecraft:uniform","min":3,"max":9}
+					"weight":6
-				}],
+				},
-				"weight":7
+				{
-			},
+					"type":"item",
-			{
+					"name":"minecraft:phantom_membrane",
-				"type":"item",
+					"functions":[{
-				"name":"minecraft:splash_potion",
+						"function":"minecraft:set_count",
-				"functions":[{
+						"count": {"type":"minecraft:uniform","min":3,"max":9}
-					"function":"minecraft:set_potion",
+					}],
-					"id":"minecraft:strong_leaping"
+					"weight":7
-				}],
+				},
-				"weight":4
+				{
-			}
+					"type":"item",
-		]
+					"name":"minecraft:splash_potion",
-	}]
+					"functions":[{
-}
+						"function":"minecraft:set_potion",
+						"id":"minecraft:strong_leaping"
+					}],
+					"weight":4
+				}
+			]
+		}
+	]	
+}	

overrides/global_packs/required_data/mc_rebalance_datapack/data/tconstruct/mantle/loot_injectors/fishing_treasure.json

@@ -0,0 +1 @@
+{}