Compare commits

..

No commits in common. "2.3.0" and "2.2.0" have entirely different histories.
2.3.0 ... 2.2.0

12 changed files with 17 additions and 474 deletions

View file

@ -5,25 +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/), 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). and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [2.3.0]
### Added
- Added enchantment's exclusive sets to their descriptions
- Added [Better Keep Inventory](https://modrinth.com/datapack/better-keep-inventory-datapack)
- On death you'll now drop everything besides your tools and armour
- The item spread is also off
- Added [Language Reload](https://modrinth.com/mod/language-reload), [Trimmable Tools](https://modrinth.com/datapack/trimmable-tools), [Boat Break Fix](https://modrinth.com/mod/boat-break-fix), [Simple Snowy Fix](https://modrinth.com/mod/simple-snowy-fix-\(forge-fabric\)), [Volume Fix](https://modrinth.com/mod/volume-fix), [HRTF Fix](https://modrinth.com/mod/hrtffix), [Dragon Movement Fix](https://modrinth.com/datapack/dragon-movement-fix)
- Ported cheaper rails recipes from 1.20 modpack
### Changed
- Updated Vanilla backport, Platform lib, and Enderpearl Backport
### Fixed
- Fixed Ender Dragon melee attack damage applying every tick with no cooldown
## [2.2.0] ## [2.2.0]
### Added ### Added
@ -63,8 +44,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
Initial 2.0.0 release Initial 2.0.0 release
[unreleased]: https://patience.nearmisses.xyz/SergeantAcoustic/tinkers_tinkering/compare/2.3.0...HEAD [unreleased]: https://patience.nearmisses.xyz/SergeantAcoustic/tinkers_tinkering/compare/2.2.0...HEAD
[2.3.0]: https://patience.nearmisses.xyz/SergeantAcoustic/tinkers_tinkering/compare/2.2.0...2.3.0
[2.2.0]: https://patience.nearmisses.xyz/SergeantAcoustic/tinkers_tinkering/compare/2.1.0...2.2.0 [2.2.0]: https://patience.nearmisses.xyz/SergeantAcoustic/tinkers_tinkering/compare/2.1.0...2.2.0
[2.1.0]: https://patience.nearmisses.xyz/SergeantAcoustic/tinkers_tinkering/compare/2.0.0...2.1.0 [2.1.0]: https://patience.nearmisses.xyz/SergeantAcoustic/tinkers_tinkering/compare/2.0.0...2.1.0
[2.0.0]: https://patience.nearmisses.xyz/SergeantAcoustic/tinkers_tinkering/releases/tag/2.0.0 [2.0.0]: https://patience.nearmisses.xyz/SergeantAcoustic/tinkers_tinkering/releases/tag/2.0.0

View file

@ -6,7 +6,7 @@
"formatVersion": 1, "formatVersion": 1,
"game": "minecraft", "game": "minecraft",
"name": "MC Rebalanced", "name": "MC Rebalanced",
"versionId": "2.3.0", "versionId": "2.2.0",
"files": [ "files": [
{ {
"downloads": [ "downloads": [
@ -70,33 +70,33 @@
}, },
{ {
"downloads": [ "downloads": [
"https://cdn.modrinth.com/data/6xwxDTgf/versions/wAeQBuFY/VanillaBackport-fabric-1.21.1-1.1.6.3.jar" "https://cdn.modrinth.com/data/6xwxDTgf/versions/dQd9n3aB/VanillaBackport-fabric-1.21.1-1.1.5.4.2.jar"
], ],
"env": { "env": {
"client": "required", "client": "required",
"server": "required" "server": "required"
}, },
"fileSize": 27541846, "fileSize": 28549222,
"hashes": { "hashes": {
"sha1": "39564fc06204353c24c22d26cd362af0732c147c", "sha1": "a1d7396d5ab9b22dfbf7d18e125a8a7e8f57a968",
"sha512": "e75b73eda047e4d4b3504985aadcacf951944c27f523d0bc17b139b19a3b6170f745fd285790fe6a0e215bfa0f06b862095c160b6c79bc026aa0cd5d4f3277e0" "sha512": "9623f846019e236583f4791cf8a9062089d62c3b67b89f478c918aaf09dce735ef2857021b9c1500cf6fa1557b6fea760dfef834056ed77643d0fec26601c21f"
}, },
"path": "mods/VanillaBackport-fabric-1.21.1-1.1.6.3.jar" "path": "mods/VanillaBackport-fabric-1.21.1-1.1.5.4.2.jar"
}, },
{ {
"downloads": [ "downloads": [
"https://cdn.modrinth.com/data/i6fiqm5y/versions/WeSu6O41/Platform-fabric-1.21.1-1.3.jar" "https://cdn.modrinth.com/data/i6fiqm5y/versions/gV5SV031/Platform-fabric-1.21.1-1.2.11.5.jar"
], ],
"env": { "env": {
"client": "required", "client": "required",
"server": "required" "server": "required"
}, },
"fileSize": 719170, "fileSize": 731829,
"hashes": { "hashes": {
"sha1": "abc57a537cd2f2f5613d43455a31264095198154", "sha1": "355c4ddaf0e9362c570ccd8d1576c6fae9290071",
"sha512": "b519abb4623fb2b986371d8d0c54bd29a4cfec02c04d4e2d7edc46a9cc0d045257ba5c479ea43aef32ef8dda79a2a8de9b03cc06ca90d6114d48ccc2e7a21a7c" "sha512": "d08fdbef9148e38f306c951d03c8382308bccca65c4d269ed2901f9e838b8e62bdbdcc8f86e6f02429a52184163653b4914f47eaaf8e90a72370080201a55700"
}, },
"path": "mods/Platform-fabric-1.21.1-1.3.jar" "path": "mods/Platform-fabric-1.21.1-1.2.11.5.jar"
}, },
{ {
"downloads": [ "downloads": [
@ -460,18 +460,18 @@
}, },
{ {
"downloads": [ "downloads": [
"https://cdn.modrinth.com/data/tfgqelN2/versions/iNDHgEJS/enderpearl-backport-1.21-1.1.5.jar" "https://cdn.modrinth.com/data/tfgqelN2/versions/y3X6z96U/enderpearl-backport-1.21-1.1.3.jar"
], ],
"env": { "env": {
"client": "required", "client": "required",
"server": "required" "server": "required"
}, },
"fileSize": 27102, "fileSize": 26196,
"hashes": { "hashes": {
"sha1": "a14530c22f7826c5e48b883cce0755e110b67d46", "sha1": "77a42ae4844bd607a066e983b3fd5ccbad76c401",
"sha512": "b3ab735981ed6df9471a7ddbe1b2f859227dcf4120005a89670d1145f3da21e71324347c1c30eacec7d151fb4a305b088980b1e1ece8982b905553ff111126d3" "sha512": "a1456b480953adb08e688cc55d951d3d034a4505658ffdf0855bdc709a55d52782ce35a4598234accb922a44bfa56801c01e5070fa6ca28c95e81f0ef1fe6822"
}, },
"path": "mods/enderpearl-backport-1.21-1.1.5.jar" "path": "mods/enderpearl-backport-1.21-1.1.3.jar"
}, },
{ {
"downloads": [ "downloads": [
@ -1162,141 +1162,6 @@
"sha512": "4fdb6a9bfd5706299114810751b43b22fa1e8565f2666ba07bca24c5c9b09af2ae2a311ac02062a7453f4c6a38001525868486a111134335a0e60392759202cc" "sha512": "4fdb6a9bfd5706299114810751b43b22fa1e8565f2666ba07bca24c5c9b09af2ae2a311ac02062a7453f4c6a38001525868486a111134335a0e60392759202cc"
}, },
"path": "mods/logical-iframes-1.1.1.jar" "path": "mods/logical-iframes-1.1.1.jar"
},
{
"downloads": [
"https://cdn.modrinth.com/data/OVb8ZE5p/versions/Uf9jCC3m/BoatBreakFix-Universal-1.0.2.jar"
],
"env": {
"client": "required",
"server": "required"
},
"fileSize": 6866,
"hashes": {
"sha1": "f0bc583479532b7a83cded5ac86f0b3622c69558",
"sha512": "7dedce72e959a05db469ff7e6175d7bc7189ed012ecb4bbbf299f0ee2b1876c67753731e05928ba8743b294cf5b208da01056d65ca51c27ad14b2313addcea92"
},
"path": "mods/BoatBreakFix-Universal-1.0.2.jar"
},
{
"downloads": [
"https://cdn.modrinth.com/data/P1Kv5EAO/versions/O6odCETu/Necronomicon-Fabric-1.6.0%2B1.21.jar"
],
"env": {
"client": "required",
"server": "required"
},
"fileSize": 37055,
"hashes": {
"sha1": "b6ac70d9ecac570f56e75db81d8281976fea1357",
"sha512": "0deeb7ed7914994bf274547d7c665be460a27a2526adc00f3708b257bab8b51204dc6c8b3b2259440c57b3ebfeaa3d8ca9e9c4308f0265a041233dbeb5eae2af"
},
"path": "mods/Necronomicon-Fabric-1.6.0+1.21.jar"
},
{
"downloads": [
"https://cdn.modrinth.com/data/3WP3HZRG/versions/K637FjjR/simple_snowy_fix-1.21.1-1.21.11-2.1.9-fabric.jar"
],
"env": {
"client": "required",
"server": "required"
},
"fileSize": 120154,
"hashes": {
"sha1": "08dd6c0de036c17e6843e16e780dd9396855651d",
"sha512": "d5f0a7db96e2c6cb3bf1a59b19a98fc21be856a9add8f8decaae913160d4dbd3f628194ece57aa36397e307a327d8f2fc351310e25e9e54193e912cc409f0a41"
},
"path": "mods/simple_snowy_fix-1.21.1-1.21.11-2.1.9-fabric.jar"
},
{
"downloads": [
"https://cdn.modrinth.com/data/Iywe4QI4/versions/6UZ5mKrA/volumefix-1.2.0%2B1.21.jar"
],
"env": {
"client": "required",
"server": "required"
},
"fileSize": 9136,
"hashes": {
"sha1": "7346203754a7201daa1c924f50bc22b9a279d560",
"sha512": "7b51002618bef61c5a0210f9570365395f8dcc8e172a66d6373e81fae46de328bce931b9d66b0ab4caff0405885ff019cc9ace11d3479aeee9c978c99db9d74e"
},
"path": "mods/volumefix-1.2.0+1.21.jar"
},
{
"downloads": [
"https://cdn.modrinth.com/data/Y3o9dZWX/versions/u3JPxrCm/hrtffix-fabric-1.0.0.jar"
],
"env": {
"client": "required",
"server": "required"
},
"fileSize": 9862,
"hashes": {
"sha1": "f31754f2cdcd28a42283b9d3a25909b98cd59064",
"sha512": "5a12f200aec2ff8f07aae25f7212b76b24386c7c979d2c5658a6ee68cb0bfa895b0b35b09f55a9e2f28e8f6f5a91293c85dea071bc6786f74224f28f091dd32f"
},
"path": "mods/hrtffix-fabric-1.0.0.jar"
},
{
"downloads": [
"https://cdn.modrinth.com/data/6E5wF2bY/versions/LRjqWIC2/dragon-movement-fix-1.1.6.jar"
],
"env": {
"client": "required",
"server": "required"
},
"fileSize": 12984,
"hashes": {
"sha1": "8d269a801c8aa4328dd1db61dedd2c11a7afd912",
"sha512": "a51f1c5931c5729b665e30af7d91d8a91962137224ac1a0d36d15ea8cff3c67eeec7899632ea14913605e00dd11ced71f4e6edcea454b507d6de58973e8bce21"
},
"path": "mods/dragon-movement-fix-1.1.6.jar"
},
{
"downloads": [
"https://cdn.modrinth.com/data/uLbm7CG6/versions/lLMGPiZe/language-reload-1.7.6%2B1.21.1.jar"
],
"env": {
"client": "required",
"server": "required"
},
"fileSize": 75091,
"hashes": {
"sha1": "95c1266f43e330d4848dcf2e11a6be98a8990ce5",
"sha512": "39dfb0490a26baea1f79e0e86116f89ff85213df1e528c2727ea84c64f6e6b889817089d5faa4b15a4648393787ec5305b96eed29ce506d9129aa4b7a50b66b1"
},
"path": "mods/language-reload-1.7.6+1.21.1.jar"
},
{
"downloads": [
"https://cdn.modrinth.com/data/WzVQCdgr/versions/5VkorMHZ/bKeepInv_1.3_1.20.5-26.1.zip"
],
"env": {
"client": "required",
"server": "required"
},
"fileSize": 87114,
"hashes": {
"sha1": "060e9f774f3f9a26012f4dee6937e45112444fc8",
"sha512": "7bc3e0d6dbbd660775d1eb6364911deed8b8385cd3160317842cbed8be57f4a8b4bec0c4c558f4bb15936067af96dbca924d11a6c4d7da41f8b1ccf9e48aedab"
},
"path": "resources/datapack/required/bKeepInv_1.3_1.20.5-26.1.zip"
},
{
"downloads": [
"https://cdn.modrinth.com/data/MJu3fF3K/versions/d0JX71gl/trimmable_tools-fabric-1.21.1-2.0.5.jar"
],
"env": {
"client": "required",
"server": "required"
},
"fileSize": 171136,
"hashes": {
"sha1": "cd328ce2fc4daf510f2448af6a9f05ac3648d6bc",
"sha512": "143848039931aff35c0e56ebbddb55a4dcbc59beb5040972daca8cf71dfaf842d29895babd5bbd3803956f9185469c4eee01fb28c14a9400d48572a11edc318e"
},
"path": "mods/trimmable_tools-fabric-1.21.1-2.0.5.jar"
} }
] ]
} }

View file

@ -1,11 +0,0 @@
scoreboard objectives add Settings dummy
scoreboard objectives add Temp dummy
scoreboard objectives add YPos dummy
scoreboard objectives add PrevY dummy
scoreboard objectives add YDiff dummy
scoreboard objectives add YVel dummy
scoreboard objectives add DMFSettings dummy
#reference in case i need it
scoreboard objectives add DragonPhase dummy
scoreboard players set Loaded Temp 1

View file

@ -1,28 +0,0 @@
{
"type": "minecraft:crafting_shaped",
"category": "misc",
"key": {
"#": {
"item": "minecraft:stick"
},
"R": {
"item": "minecraft:redstone_torch"
},
"X": {
"item": "minecraft:iron_nugget"
},
"*": {
"item": "minecraft:glowstone_dust"
}
},
"pattern": [
"X*X",
"X#X",
"XRX"
],
"result": {
"count": 4,
"id": "minecraft:activator_rail"
},
"show_notification": true
}

View file

@ -1,28 +0,0 @@
{
"type": "minecraft:crafting_shaped",
"category": "misc",
"key": {
"#": {
"item": "minecraft:stick"
},
"P": {
"item": "minecraft:stone_pressure_plate"
},
"X": {
"item": "minecraft:iron_nugget"
},
"*": {
"item": "minecraft:quartz"
}
},
"pattern": [
"X*X",
"X#X",
"XPX"
],
"result": {
"count": 4,
"id": "minecraft:detector_rail"
},
"show_notification": true
}

View file

@ -1,25 +0,0 @@
{
"type": "minecraft:crafting_shaped",
"category": "misc",
"key": {
"#": {
"item": "minecraft:stick"
},
"R": {
"item": "minecraft:redstone"
},
"X": {
"item": "minecraft:gold_nugget"
}
},
"pattern": [
"X X",
"X#X",
"XRX"
],
"result": {
"count": 8,
"id": "minecraft:powered_rail"
},
"show_notification": true
}

View file

@ -1,22 +0,0 @@
{
"type": "minecraft:crafting_shaped",
"category": "misc",
"key": {
"#": {
"item": "minecraft:stick"
},
"X": {
"item": "minecraft:iron_nugget"
}
},
"pattern": [
"X X",
"X#X",
"X X"
],
"result": {
"count": 16,
"id": "minecraft:rail"
},
"show_notification": true
}

View file

@ -1,23 +0,0 @@
# Change from original file: Removed item spread
# Summon and clear singular slot
$summon item ~ ~ ~ {Age:$(age)s,Item:$(item)}
# Normally after Age:6000 ticks (5 minutes) the item is destroyed
# Starting with age -6000 gives it 10 minutes before it disapeares
# Clear the item from the inventory
# This part doesn't do anything for already cleared items so it can be also used for just summoning
$item modify entity @s $(type).$(Slot) {\
"function": "minecraft:set_count",\
"count": {\
"type": "minecraft:score",\
"target": {\
"type": "minecraft:fixed",\
"name": "#item_count"\
},\
"score": "levels",\
"scale": -1\
},\
"add": true,\
"conditions": []\
}

View file

@ -1,21 +0,0 @@
# XP kept by player (in %)
scoreboard players set #xp_left levels 100
# Percentage of lost xp that is dropped (in %)
scoreboard players set #xp_dropped levels 0
# Percentage of items dropped, rounded down.
# Utleast 1 item is dropped, unless set to 0.
# If item has count 1 this value becomes the base for the random chance of it being dropped.
scoreboard players set #items_dropped levels 100
# Item and xp lifetime (in minutes).
# How long before they despawn.
scoreboard players set #lifetime levels 5
# Show players settings for this datapack on theirs first join
scoreboard players set #show_fjoin levels 0
# Show settings
function bki:settings

View file

@ -1,137 +0,0 @@
# List of items that always remain after death
# Except for items with the nbt tag always_drop:1b, because this tag have higher priority
# The list formatting must always remain as shown in the example
# "minecraft:<item_name>",\
data modify storage bki:bki safe.list set value [\
"minecraft:elytra",\
"minecraft:turtle_helmet",\
"minecraft:wooden_shovel",\
"minecraft:wooden_pickaxe",\
"minecraft:wooden_axe",\
"minecraft:wooden_hoe",\
"mc_rebalance:wooden_paxel",\
"minecraft:wooden_sword",\
"minecraft:wooden_spear",\
"minecraft:leather_helmet",\
"minecraft:leather_chestplate",\
"minecraft:leather_leggings",\
"minecraft:leather_boots",\
"minecraft:chainmail_helmet",\
"minecraft:chainmail_chestplate",\
"minecraft:chainmail_leggings",\
"minecraft:chainmail_boots",\
"minecraft:stone_shovel",\
"minecraft:stone_pickaxe",\
"minecraft:stone_axe",\
"minecraft:stone_hoe",\
"mc_rebalance:stone_paxel",\
"minecraft:stone_sword",\
"minecraft:stone_spear",\
"minecraft:stone_helmet",\
"minecraft:stone_chestplate",\
"minecraft:stone_leggings",\
"minecraft:stone_boots",\
"minecraft:copper_shovel",\
"minecraft:copper_pickaxe",\
"minecraft:copper_axe",\
"minecraft:copper_hoe",\
"mc_rebalance:copper_paxel",\
"minecraft:copper_sword",\
"minecraft:copper_spear",\
"minecraft:copper_helmet",\
"minecraft:copper_chestplate",\
"minecraft:copper_leggings",\
"minecraft:copper_boots",\
"minecraft:iron_shovel",\
"minecraft:iron_pickaxe",\
"minecraft:iron_axe",\
"minecraft:iron_hoe",\
"mc_rebalance:iron_paxel",\
"minecraft:iron_sword",\
"minecraft:iron_spear",\
"minecraft:iron_helmet",\
"minecraft:iron_chestplate",\
"minecraft:iron_leggings",\
"minecraft:iron_boots",\
"minecraft:golden_shovel",\
"minecraft:golden_pickaxe",\
"minecraft:golden_axe",\
"minecraft:golden_hoe",\
"mc_rebalance:golden_paxel",\
"minecraft:golden_sword",\
"minecraft:golden_spear",\
"minecraft:golden_helmet",\
"minecraft:golden_chestplate",\
"minecraft:golden_leggings",\
"minecraft:golden_boots",\
"minecraft:diamond_shovel",\
"minecraft:diamond_pickaxe",\
"minecraft:diamond_axe",\
"minecraft:diamond_hoe",\
"mc_rebalance:diamond_paxel",\
"minecraft:diamond_sword",\
"minecraft:diamond_spear",\
"minecraft:diamond_helmet",\
"minecraft:diamond_chestplate",\
"minecraft:diamond_leggings",\
"minecraft:diamond_boots",\
"minecraft:netherite_shovel",\
"minecraft:netherite_pickaxe",\
"minecraft:netherite_axe",\
"minecraft:netherite_hoe",\
"mc_rebalance:netherite_paxel",\
"minecraft:netherite_sword",\
"minecraft:netherite_spear",\
"minecraft:netherite_helmet",\
"minecraft:netherite_chestplate",\
"minecraft:netherite_leggings",\
"minecraft:netherite_boots",\
"minecraft:ender_chest",\
"aa4-atlas:antique_atlas",\
"minecraft:spyglass",\
"minecraft:clock",\
"minecraft:compass",\
"minecraft:recovery_compass",\
"minecraft:shield",\
"minecraft:white_bed",\
"minecraft:orange_bed",\
"minecraft:magenta_bed",\
"minecraft:light_blue_bed",\
"minecraft:yellow_bed",\
"minecraft:lime_bed",\
"minecraft:pink_bed",\
"minecraft:gray_bed",\
"minecraft:light_gray_bed",\
"minecraft:cyan_bed",\
"minecraft:purple_bed",\
"minecraft:blue_bed",\
"minecraft:brown_bed",\
"minecraft:green_bed",\
"minecraft:red_bed",\
"minecraft:black_bed",\
"minecraft:water_bucket",\
"minecraft:bucket",\
"minecraft:torch",\
"minecraft:crafting_table",\
"minecraft:pale_oak_boat",\
"minecraft:oak_boat",\
"minecraft:birch_boat",\
"minecraft:spruce_boat",\
"minecraft:jungle_boat",\
"minecraft:dark_oak_boat",\
"minecraft:acacia_boat",\
"minecraft:mangrove_boat",\
"minecraft:cherry_boat",\
"minecraft:bamboo_raft",\
"minecraft:pale_chest_oak_boat",\
"minecraft:oak_chest_boat",\
"minecraft:birch_chest_boat",\
"minecraft:spruce_chest_boat",\
"minecraft:jungle_chest_boat",\
"minecraft:dark_chest_oak_boat",\
"minecraft:acacia_chest_boat",\
"minecraft:mangrove_chest_boat",\
"minecraft:cherry_chest_boat",\
"minecraft:bamboo_chest_raft"\
]

View file

@ -1,7 +0,0 @@
{
"pack": {
"description":"Made to have a higher load order than better keep inventory",
"pack_format": 48,
"supported_formats": [34, 48]
}
}