SergeantAcoustic/tinkers_tinkering
2
0
Fork 0
Code Issues Actions Releases 14 Activity

Compare commits

base: SergeantAcoustic:9e6bd5ed3cd3ddf6e2eff8a6b68882ec3c7b9c86
Branches Tags
SergeantAcoustic:1.21.1
SergeantAcoustic:main
SergeantAcoustic:2.3.0
SergeantAcoustic:2.2.0
SergeantAcoustic:2.1.0
SergeantAcoustic:2.0.0
SergeantAcoustic:1.3.0
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:0f3d4b8b3f3243485d77aca7fda9640162e2d7e9
Branches Tags
SergeantAcoustic:1.21.1
SergeantAcoustic:main
SergeantAcoustic:2.3.0
SergeantAcoustic:2.2.0
SergeantAcoustic:2.1.0
SergeantAcoustic:2.0.0
SergeantAcoustic:1.3.0
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. "9e6bd5ed3cd3ddf6e2eff8a6b68882ec3c7b9c86" and "0f3d4b8b3f3243485d77aca7fda9640162e2d7e9" have entirely different histories.
9e6bd5ed3c ... 0f3d4b8b3f

24 changed files with 6 additions and 106 deletions
Show stats Expand all files Collapse all files

3
overrides/global_packs/mc_rebalance_datapack/data/c/utils/inverse-tags/enchantment/weapon_damage_enhancements.json
View file

@ -1,4 +1,3 @@
[
"minecraft:sharpness",
"minecraft:power"
"minecraft:sharpness"
]

0
overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/tools/copper_armor/boots.json → overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/copper_armor/boots.json
View file

0
overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/tools/copper_armor/chestplate.json → overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/copper_armor/chestplate.json
View file

0
overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/tools/copper_armor/helmet.json → overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/copper_armor/helmet.json
View file

0
overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/tools/copper_armor/leggings.json → overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/copper_armor/leggings.json
View file

0
overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/tools/gold/boots.json → overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/gold/boots.json
View file

0
overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/tools/gold/chestplate.json → overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/gold/chestplate.json
View file

0
overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/tools/gold/helmet.json → overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/gold/helmet.json
View file

0
overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/tools/gold/leggings.json → overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/gold/leggings.json
View file

2
overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/tools/gold/tools/axe.json → overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/gold/tools/axe.json
View file

@ -14,7 +14,7 @@
"type": "generic.attack_damage",
"slot": "mainhand",
"id": "base_attack_damage",
"amount": 9,
"amount": 8,
"operation": "add_value"
},
{

0
overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/tools/gold/tools/durability.json → overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/gold/tools/durability.json
View file

0
overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/tools/gold/tools/hoe.json → overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/gold/tools/hoe.json
View file

0
overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/tools/gold/tools/pickaxe.json → overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/gold/tools/pickaxe.json
View file

0
overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/tools/gold/tools/shovel.json → overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/gold/tools/shovel.json
View file

0
overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/tools/gold/tools/spear.json → overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/gold/tools/spear.json
View file

2
overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/tools/gold/tools/sword.json → overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/gold/tools/sword.json
View file

@ -8,7 +8,7 @@
"type": "generic.attack_damage",
"slot": "mainhand",
"id": "base_attack_damage",
"amount": 6,
"amount": 5.5,
"operation": "add_value"
},
{

23
overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/tools/diamond/axe.json
View file

@ -1,23 +0,0 @@
{
"items": [
"minecraft:diamond_axe"
],
"patch": {
"attribute_modifiers": [
{
"type": "generic.attack_damage",
"slot": "mainhand",
"id": "base_attack_damage",
"amount": 11,
"operation": "add_value"
},
{
"type": "minecraft:generic.attack_speed",
"id": "minecraft:base_attack_speed",
"amount": -3,
"operation": "add_value",
"slot": "mainhand"
}
]
}
}

23
overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/tools/diamond/sword.json
View file

@ -1,23 +0,0 @@
{
"items": [
"minecraft:diamond_sword"
],
"patch": {
"attribute_modifiers": [
{
"type": "generic.attack_damage",
"slot": "mainhand",
"id": "base_attack_damage",
"amount": 7,
"operation": "add_value"
},
{
"type": "minecraft:generic.attack_speed",
"id": "minecraft:base_attack_speed",
"amount": -2.4000000953674316,
"operation": "add_value",
"slot": "mainhand"
}
]
}
}

23
overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/tools/netherite/axe.json
View file

@ -1,23 +0,0 @@
{
"items": [
"minecraft:netherite_axe"
],
"patch": {
"attribute_modifiers": [
{
"type": "generic.attack_damage",
"slot": "mainhand",
"id": "base_attack_damage",
"amount": 14,
"operation": "add_value"
},
{
"type": "minecraft:generic.attack_speed",
"id": "minecraft:base_attack_speed",
"amount": -3,
"operation": "add_value",
"slot": "mainhand"
}
]
}
}

23
overrides/global_packs/mc_rebalance_datapack/data/minecraft/defaulted/default_component_patches/tools/netherite/sword.json
View file

@ -1,23 +0,0 @@
{
"items": [
"minecraft:netherite_sword"
],
"patch": {
"attribute_modifiers": [
{
"type": "generic.attack_damage",
"slot": "mainhand",
"id": "base_attack_damage",
"amount": 9,
"operation": "add_value"
},
{
"type": "minecraft:generic.attack_speed",
"id": "minecraft:base_attack_speed",
"amount": -2.4000000953674316,
"operation": "add_value",
"slot": "mainhand"
}
]
}
}

5
overrides/global_packs/mc_rebalance_datapack/data/minecraft/loot_table/equipment/trial_chamber_ranged.json.patch
View file

@ -1,5 +0,0 @@
{
"op": "remove",
"path": "/pools/1/entries/1/functions"
}

3
overrides/global_packs/mc_rebalance_datapack/data/minecraft/utils/inverse-tags/enchantment/non_treasure.json
View file

@ -1,5 +1,4 @@
[
"minecraft:protection",
"minecraft:sharpness",
"minecraft:power"
"minecraft:sharpness"
]

3
overrides/global_packs/mc_rebalance_datapack/data/minecraft/utils/inverse-tags/enchantment/tooltip_order.json
View file

@ -1,5 +1,4 @@
[
"minecraft:sharpness",
"minecraft:protection",
"minecraft:power"
"minecraft:protection"
]

2
overrides/global_packs/mc_rebalance_datapack/pack.mcmeta
View file

@ -140,7 +140,7 @@
},
{
"namespace": "minecraft",
"path": "enchantment/(protection|sharpness|power).json"
"path": "enchantment/(protection|sharpness).json"
},
{
"namespace": "enderitemod",