Compare commits

..

No commits in common. "1.1.1" and "1.1.0" have entirely different histories.
1.1.1 ... 1.1.0

8 changed files with 111 additions and 180 deletions

View file

@ -15,3 +15,16 @@ Packed in Modrinth format, because [Modrinth](https://modrinth.com) is the super
To create a release, run [./export-pack.sh](export-pack.sh) To create a release, run [./export-pack.sh](export-pack.sh)
* It will be generated in [release/Tinker's tinkering.mrpack](Tinker's%20tinkering.mrpack) * It will be generated in [release/Tinker's tinkering.mrpack](Tinker's%20tinkering.mrpack)
### Saving login details
This script clones the [mc_rebalance](https://patience.nearmisses.xyz/patience/mc_rebalance) and [mc_rebalance_datapack](https://patience.nearmisses.xyz/SergeantAcoustic/mc_rebalance_datapack) repos, so you will need to provide login credentials to git twice every time you run the script.
To solve this, consider one of the following:
#### SSH mode
Refer to [this guide](https://docs.codeberg.org/security/ssh-key/) on how to set up SSH key authentication
#### HTTPS mode
* To clone the repositories in HTTPS mode, run the script with any data at the end i.e. `./export-pack.sh 1`
* Running `git config --global credential.helper store` will save your credentials to your global git config directory
* **Beware that this is stored in plaintext, so only do it on a private device**

View file

@ -6,7 +6,7 @@
"formatVersion": 1, "formatVersion": 1,
"game": "minecraft", "game": "minecraft",
"name": "MC Rebalanced", "name": "MC Rebalanced",
"versionId": "1.1.1", "versionId": "1.1.0",
"files": [ "files": [
{ {
"downloads": [ "downloads": [
@ -1495,18 +1495,18 @@
}, },
{ {
"downloads": [ "downloads": [
"https://cdn.modrinth.com/data/1ZcJmvwC/versions/8UxW69S8/StackSize-v1.3.jar" "https://cdn.modrinth.com/data/Kl6kcZ08/versions/GTpnzJhD/stackables-2.0.1%2B1.20.jar"
], ],
"env": { "env": {
"client": "required", "client": "required",
"server": "required" "server": "required"
}, },
"fileSize": 16294, "fileSize": 617946,
"hashes": { "hashes": {
"sha1": "b230b993a7d38dea1d05c05961d84fd763b7f2ef", "sha1": "4d41ad3b71cf3840b7e000200ac5fd6ecb92f2b9",
"sha512": "fc9dd7f9e041d0874da33002bd4961fbbbb9416bc37a69024f27e52bea1de33a263dd5d1073f21e0df8a77b107db396267d2caf65c82336c290b1ef91413093e" "sha512": "2e768b43451d94093b627faa5c9684b597485574a9947f81fa6e8d45f76d1a29ab244acb53ba2cf9917d1b60aa8d068c8717706fcbede9f004bb19e7c41c6662"
}, },
"path": "mods/StackSize-v1.3.jar" "path": "mods/stackables-2.0.1+1.20.jar"
}, },
{ {
"downloads": [ "downloads": [

View file

@ -5,7 +5,7 @@
"Chest Slot" = ["minecraft:leather_chestplate|35", "minecraft:chainmail_chestplate|25", "minecraft:iron_chestplate|10", "advanced_copper:copper_armor_chestplate|15"] "Chest Slot" = ["minecraft:leather_chestplate|35", "minecraft:chainmail_chestplate|25", "minecraft:iron_chestplate|10", "advanced_copper:copper_armor_chestplate|15"]
"Legs Slot" = ["minecraft:leather_leggings|35", "minecraft:chainmail_leggings|25", "minecraft:iron_leggings|10", "advanced_copper:copper_armor_leggings|15"] "Legs Slot" = ["minecraft:leather_leggings|35", "minecraft:chainmail_leggings|25", "minecraft:iron_leggings|10", "advanced_copper:copper_armor_leggings|15"]
"Boots Slot" = ["minecraft:leather_boots|35", "minecraft:chainmail_boots|25", "minecraft:iron_boots|10", "advanced_copper:copper_armor_boots|15"] "Boots Slot" = ["minecraft:leather_boots|35", "minecraft:chainmail_boots|25", "minecraft:iron_boots|10", "advanced_copper:copper_armor_boots|15"]
"Main Hand Slot" = ["minecraft:bow|2000", "minecraft:stone_sword|50", "minecraft:iron_sword|10"] "Main Hand Slot" = ["minecraft:bow|2000", "minecraft:wooden_sword|250", "minecraft:stone_sword|50", "minecraft:iron_sword|10"]
#Default true #Default true
"Should skeletons spawn with more armor and tools and more commonly" = true "Should skeletons spawn with more armor and tools and more commonly" = true
#Default 250 #Default 250

View file

@ -5,7 +5,7 @@
"Chest Slot" = ["minecraft:iron_chestplate|100", "minecraft:chainmail_chestplate|175", "minecraft:leather_chestplate|250", "advanced_copper:copper_armor_chestplate|100"] "Chest Slot" = ["minecraft:iron_chestplate|100", "minecraft:chainmail_chestplate|175", "minecraft:leather_chestplate|250", "advanced_copper:copper_armor_chestplate|100"]
"Legs Slot" = ["minecraft:iron_leggings|100", "minecraft:chainmail_leggings|175", "minecraft:leather_leggings|250", "advanced_copper:copper_armor_leggings|100"] "Legs Slot" = ["minecraft:iron_leggings|100", "minecraft:chainmail_leggings|175", "minecraft:leather_leggings|250", "advanced_copper:copper_armor_leggings|100"]
"Boots Slot" = ["minecraft:iron_boots|100", "minecraft:chainmail_boots|175", "minecraft:leather_boots|250", "advanced_copper:copper_armor_boots|100"] "Boots Slot" = ["minecraft:iron_boots|100", "minecraft:chainmail_boots|175", "minecraft:leather_boots|250", "advanced_copper:copper_armor_boots|100"]
"Main Hand Slot" = ["minecraft:iron_sword|100", "minecraft:stone_sword|250"] "Main Hand Slot" = ["minecraft:iron_sword|100", "minecraft:stone_sword|250", "minecraft:wooden_sword|400"]
"Off Hand Slot" = ["minecraft:shield|100"] "Off Hand Slot" = ["minecraft:shield|100"]
#Default true #Default true
"Should zombies spawn with more armor and tools and more commonly" = true "Should zombies spawn with more armor and tools and more commonly" = true

View file

@ -11,7 +11,7 @@ key_key.do_a_barrel_roll.pitch_up:key.keyboard.unknown
key_key.do_a_barrel_roll.roll_left:key.keyboard.unknown key_key.do_a_barrel_roll.roll_left:key.keyboard.unknown
key_key.do_a_barrel_roll.roll_right:key.keyboard.unknown key_key.do_a_barrel_roll.roll_right:key.keyboard.unknown
key_key.do_a_barrel_roll.thrust_backward:key.keyboard.unknown key_key.do_a_barrel_roll.thrust_backward:key.keyboard.unknown
key_key.do_a_barrel_roll.thrust_forward:key.keyboard.unknown key_key.do_a_barrel_roll.thrust_forward:key.keyboard.w
key_key.do_a_barrel_roll.toggle_enabled:key.keyboard.i key_key.do_a_barrel_roll.toggle_enabled:key.keyboard.i
key_key.do_a_barrel_roll.toggle_thrust:key.keyboard.unknown key_key.do_a_barrel_roll.toggle_thrust:key.keyboard.unknown
key_key.do_a_barrel_roll.yaw_left:key.keyboard.a key_key.do_a_barrel_roll.yaw_left:key.keyboard.a
@ -84,8 +84,8 @@ key_key.spectatorOutlines:key.keyboard.unknown
key_key.sprint:key.keyboard.left.control key_key.sprint:key.keyboard.left.control
key_key.spyglass_of_curios.use:key.keyboard.c key_key.spyglass_of_curios.use:key.keyboard.c
key_key.swapOffhand:key.keyboard.f key_key.swapOffhand:key.keyboard.f
key_key.tconstruct.helmet_interact:key.keyboard.unknown key_key.tconstruct.helmet_interact:key.keyboard.z
key_key.tconstruct.leggings_interact:key.keyboard.unknown key_key.tconstruct.leggings_interact:key.keyboard.i
key_key.togglePerspective:key.keyboard.f5 key_key.togglePerspective:key.keyboard.f5
key_key.use:key.mouse.right key_key.use:key.mouse.right
key_keybind.invmove.toggleMove:key.keyboard.unknown key_keybind.invmove.toggleMove:key.keyboard.unknown

View file

@ -1,10 +1,6 @@
#Key bindings listed here will be hidden from the key bindings menu. #Key bindings listed here will be hidden from the key bindings menu.
#Use this to hide key bindings that are not used by the player. #Use this to hide key bindings that are not used by the player.
hide_key_bindings = [ hide_key_bindings = [
"key.do_a_barrel_roll.thrust_backward",
"key.do_a_barrel_roll.thrust_forward",
"key.do_a_barrel_roll.toggle_thrust",
"key.entityculling.toggle",
"key.horsecombatcontrols.toggle", "key.horsecombatcontrols.toggle",
"key.jei.bookmark", "key.jei.bookmark",
"key.jei.cheatItemStack", "key.jei.cheatItemStack",
@ -37,8 +33,6 @@ hide_key_bindings = [
"key.jei.toggleOverlay", "key.jei.toggleOverlay",
"key.jei.toggleWildcardHideIngredient", "key.jei.toggleWildcardHideIngredient",
"key.jei.transferRecipeBookmark", "key.jei.transferRecipeBookmark",
"key.tconstruct.helmet_interact",
"key.tconstruct.leggings_interact",
"quark.emote.cheer", "quark.emote.cheer",
"quark.emote.clap", "quark.emote.clap",
"quark.emote.facepalm", "quark.emote.facepalm",
@ -58,3 +52,4 @@ hide_key_bindings = [
"quark.keybind.patreon_emote.tpose", "quark.keybind.patreon_emote.tpose",
"quark.keybind.patreon_emote.zombie" "quark.keybind.patreon_emote.zombie"
] ]

View file

@ -0,0 +1,86 @@
# Config version is auto-generated
# DO NOT CHANGE
configVersion = 2
[stackables]
# Simple toggle for the mod! Set to false to disable.
modEnabled = true
# Whether to allow potions to stack.
potions = true
# Maximum stack size for potions.
potionCount = 16
# Whether to allow splash potions to stack.
splashPotions = true
# Maximum stack size for splash potions.
splashPotionCount = 16
# The delay/cooldown to add to throwing splash potions in game ticks.
splashPotionDelay = 0
# Whether to allow soups to stack.
soups = true
# Maximum stack size for soups.
soupCount = 16
# Whether to allow enchanted books to stack.
enchantedBooks = true
# Maximum stack size for enchanted books.
enchantedBookCount = 64
# Whether to allow full buckets to stack.
buckets = false
# Maximum stack size for full buckets.
bucketCount = 16
# Whether to allow boats to stack.
boats = true
# Maximum stack size for boats.
boatCount = 16
# Whether to allow minecarts to stack.
minecarts = true
# Maximum stack size for minecarts.
minecartCount = 16
# Whether to allow beds to stack.
beds = true
# Maximum stack size for beds.
bedCount = 16
# Whether to allow music discs to stack.
discs = true
# Maximum stack size for music discs.
discCount = 64
# Whether to allow instruments (i.e. goat horns) to stack.
instruments = true
# Maximum stack size for instruments (i.e. goat horns).
instrumentCount = 64
# Whether to allow banner patterns to stack.
patterns = true
# Maximum stack size for banner patterns.
patternCount = 64
# Whether to allow horse equipments (i.e. saddles and armor) to stack.
horseEquipments = true
# Maximum stack size for horse equipment (i.e. saddles and armor).
horseEquipmentCount = 16
# Whether to allow cakes to stack.
cakes = false
# Maximum stack size for cakes.
cakeCount = 1
# Whether to allow totems to stack.
totems = false
# Maximum stack size for totems.
totemCount = 1
# Whether to allow decorated pots to stack.
decoratedPots = true
# Maximum stack size for decorated pots.
decoratedPotCount = 64
# Maximum stack size for empty buckets.
emptyBucketCount = 16
# Maximum stack size for armor stands.
armorStandCount = 64
# Maximum stack size for banners.
bannerCount = 64
# Maximum stack size for signs.
signCount = 64
# Maximum stack size for throwables (i.e. snowballs and chicken eggs).
throwableCount = 16
# Maximum stack size for ender pearls.
enderPearlCount = 16
# Maximum stack size for drinkables (i.e. honey bottles and milk buckets).
drinkableCount = 16
# Maximum stack size for signed books.
signedBookCount = 64

View file

@ -1,163 +0,0 @@
minecraft:lingering_potion=16
minecraft:splash_potion=16
minecraft:beetroot_soup=16
minecraft:suspicious_stew=16
minecraft:rabbit_stew=16
minecraft:mushroom_stew=16
tconstruct:meat_soup=16
minecraft:enchanted_book=64
minecraft:oak_boat=16
minecraft:spruce_boat=16
minecraft:birch_boat=16
minecraft:jungle_boat=16
minecraft:acacia_boat=16
minecraft:dark_oak_boat=16
minecraft:mangrove_boat=16
minecraft:bamboo_raft=16
minecraft:cherry_boat=16
minecraft:oak_chest_boat=16
minecraft:spruce_chest_boat=16
minecraft:birch_chest_boat=16
minecraft:jungle_chest_boat=16
minecraft:acacia_chest_boat=16
minecraft:dark_oak_chest_boat=16
minecraft:mangrove_chest_boat=16
minecraft:bamboo_chest_raft=16
minecraft:cherry_chest_boat=16
quark:ancient_boat=16
quark:azalea_boat=16
quark:blossom_boat=16
quark:ancient_chest_boat=16
quark:azalea_chest_boat=16
quark:blossom_chest_boat=16
minecraft:minecart=16
minecraft:chest_minecart=16
minecraft:furnace_minecart=16
minecraft:tnt_minecart=16
minecraft:hopper_minecart=16
minecraft:black_bed=16
minecraft:blue_bed=16
minecraft:brown_bed=16
minecraft:cyan_bed=16
minecraft:gray_bed=16
minecraft:green_bed=16
minecraft:light_blue_bed=16
minecraft:light_gray_bed=16
minecraft:lime_bed=16
minecraft:magenta_bed=16
minecraft:orange_bed=16
minecraft:pink_bed=16
minecraft:purple_bed=16
minecraft:red_bed=16
minecraft:white_bed=16
minecraft:yellow_bed=16
minecraft:music_disc_5=64
minecraft:music_disc_creator=64
minecraft:music_disc_creator_music_box=64
minecraft:music_disc_otherside=64
minecraft:music_disc_pigstep=64
minecraft:music_disc_precipice=64
minecraft:music_disc_relic=64
minecraft:music_disc_11=64
minecraft:music_disc_13=64
minecraft:music_disc_blocks=64
minecraft:music_disc_cat=64
minecraft:music_disc_chirp=64
minecraft:music_disc_far=64
minecraft:music_disc_mall=64
minecraft:music_disc_mellohi=64
minecraft:music_disc_stal=64
minecraft:music_disc_strad=64
minecraft:music_disc_wait=64
minecraft:music_disc_ward=64
quark:music_disc_drips=64
quark:music_disc_ocean=64
quark:music_disc_rain=64
quark:music_disc_wind=64
quark:music_disc_fire=64
quark:music_disc_clock=64
quark:music_disc_crickets=64
quark:music_disc_chatter=64
quark:music_disc_endermosh=64
minecraft:goat_horn=64
minecraft:flower_banner_pattern=64
minecraft:creeper_banner_pattern=64
minecraft:skull_banner_pattern=64
minecraft:mojang_banner_pattern=64
minecraft:globe_banner_pattern=64
minecraft:piglin_banner_pattern=64
minecraft:saddle=16
minecraft:leather_horse_armor=16
minecraft:iron_horse_armor=16
minecraft:diamond_horse_armor=16
minecraft:golden_horse_armor=16
minecraft:decorated_pot
minecraft:armor_stand=64
minecraft:black_banner=64
minecraft:blue_banner=64
minecraft:brown_banner=64
minecraft:cyan_banner=64
minecraft:gray_banner=64
minecraft:green_banner=64
minecraft:light_blue_banner=64
minecraft:light_gray_banner=64
minecraft:lime_banner=64
minecraft:magenta_banner=64
minecraft:orange_banner=64
minecraft:pink_banner=64
minecraft:purple_banner=64
minecraft:red_banner=64
minecraft:white_banner=64
minecraft:yellow_banner=64
minecraft:oak_sign=64
minecraft:spruce_sign=64
minecraft:birch_sign=64
minecraft:acacia_sign=64
minecraft:jungle_sign=64
minecraft:dark_oak_sign=64
minecraft:crimson_sign=64
minecraft:warped_sign=64
minecraft:mangrove_sign=64
minecraft:bamboo_sign=64
minecraft:cherry_sign=64
quark:azalea_sign=64
quark:blossom_sign=64
quark:ancient_sign=64
tconstruct:greenheart_sign=64
tconstruct:skyroot_sign=64
tconstruct:bloodshroom_sign=64
tconstruct:enderbark_sign=64
minecraft:oak_hanging_sign=64
minecraft:spruce_hanging_sign=64
minecraft:birch_hanging_sign=64
minecraft:acacia_hanging_sign=64
minecraft:cherry_hanging_sign=64
minecraft:jungle_hanging_sign=64
minecraft:dark_oak_hanging_sign=64
minecraft:crimson_hanging_sign=64
minecraft:warped_hanging_sign=64
minecraft:mangrove_hanging_sign=64
minecraft:bamboo_hanging_sign=64
quark:azalea_hanging_sign=64
quark:blossom_hanging_sign=64
quark:ancient_hanging_sign=64
tconstruct:greenheart_hanging_sign=64
tconstruct:skyroot_hanging_sign=64
tconstruct:bloodshroom_hanging_sign=64
tconstruct:enderbark_hanging_sign=64
minecraft:written_book=64