SergeantAcoustic/tinkers_tinkering
2
0
Fork 0
Code Actions Packages Projects Releases 9 Activity

Compare commits

base: SergeantAcoustic:HEAD
Branches Tags
SergeantAcoustic:main
SergeantAcoustic:1.21.1
SergeantAcoustic:1.2.0
SergeantAcoustic:1.1.3
SergeantAcoustic:1.1.2
SergeantAcoustic:1.1.1
SergeantAcoustic:1.1.0
SergeantAcoustic:1.0.3
SergeantAcoustic:1.0.2
SergeantAcoustic:1.0.1
SergeantAcoustic:1.0.0
..
compare: SergeantAcoustic:1.2.0
Branches Tags
SergeantAcoustic:1.21.1
SergeantAcoustic:main
SergeantAcoustic:1.2.0
SergeantAcoustic:1.1.3
SergeantAcoustic:1.1.2
SergeantAcoustic:1.1.1
SergeantAcoustic:1.1.0
SergeantAcoustic:1.0.3
SergeantAcoustic:1.0.2
SergeantAcoustic:1.0.1
SergeantAcoustic:1.0.0

No commits in common. "HEAD" and "1.2.0" have entirely different histories.
HEAD ... 1.2.0

3 changed files with 205 additions and 219 deletions
Show stats Expand all files Collapse all files

8
CHANGELOG.md
View file

@ -5,12 +5,6 @@ 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
@ -19,7 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed
- Attempted to remove some leftover Tinkers' Contruct functional blocks
- Removed some leftover Tinkers' Contruct functional blocks
- Removed Tinkers' Construct swasher item from fishing loot table
### Removed

6
overrides/config/item_obliterator.json5
View file

@ -182,9 +182,9 @@
"tconstruct:cast_chest",
"tconstruct:seared_casting_tank",
"tconstruct:scorched_proxy_tank",
"tconstruct:scorched_alloyer",
"tconstruct:seared_heater",
"tconstruct:seared_chute"
"scorched_alloyer",
"seared_heater",
"seared_chute"
],
// -----------------------------------------------------------
// Removes an item if it contains certain nbt tag. If the whole entry (or expression) is present, the item gets removed.

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

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