-
Notifications
You must be signed in to change notification settings - Fork 65
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Fixed issues in and expanded customWeapons() - Made AXE_TOOL map to axe instead of heavy_axe
- Loading branch information
Showing
87 changed files
with
343 additions
and
108 deletions.
There are no files selected for viewing
3 changes: 3 additions & 0 deletions
3
src/main/generated/resources/data/minestuck/weapon_attributes/barbers_best_friend.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| { | ||
| "parent": "minestuck:fork_base" | ||
| } |
2 changes: 1 addition & 1 deletion
2
src/main/generated/resources/data/minestuck/weapon_attributes/batleacks.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| { | ||
| "parent": "bettercombat:heavy_axe" | ||
| "parent": "bettercombat:axe" | ||
| } |
2 changes: 1 addition & 1 deletion
2
src/main/generated/resources/data/minestuck/weapon_attributes/battleaxe.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| { | ||
| "parent": "bettercombat:double_axe" | ||
| "parent": "bettercombat:heavy_axe" | ||
| } |
3 changes: 3 additions & 0 deletions
3
src/main/generated/resources/data/minestuck/weapon_attributes/bear_poking_stick.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| { | ||
| "parent": "minestuck:cane_base" | ||
| } |
3 changes: 3 additions & 0 deletions
3
src/main/generated/resources/data/minestuck/weapon_attributes/bident.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| { | ||
| "parent": "bettercombat:trident" | ||
| } |
2 changes: 1 addition & 1 deletion
2
src/main/generated/resources/data/minestuck/weapon_attributes/bisector.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| { | ||
| "parent": "bettercombat:double_axe" | ||
| "parent": "bettercombat:heavy_axe" | ||
| } |
2 changes: 1 addition & 1 deletion
2
src/main/generated/resources/data/minestuck/weapon_attributes/blacksmith_bane.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| { | ||
| "parent": "bettercombat:heavy_axe" | ||
| "parent": "bettercombat:axe" | ||
| } |
2 changes: 1 addition & 1 deletion
2
src/main/generated/resources/data/minestuck/weapon_attributes/blacksmith_hammer.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| { | ||
| "parent": "bettercombat:hammer" | ||
| "parent": "bettercombat:mace" | ||
| } |
2 changes: 1 addition & 1 deletion
2
src/main/generated/resources/data/minestuck/weapon_attributes/cakesaw.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| { | ||
| "parent": "bettercombat:heavy_axe" | ||
| "parent": "minestuck:chainsaw_base" | ||
| } |
2 changes: 1 addition & 1 deletion
2
src/main/generated/resources/data/minestuck/weapon_attributes/candy_battleaxe.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| { | ||
| "parent": "bettercombat:double_axe" | ||
| "parent": "bettercombat:heavy_axe" | ||
| } |
3 changes: 3 additions & 0 deletions
3
src/main/generated/resources/data/minestuck/weapon_attributes/candy_cane.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| { | ||
| "parent": "minestuck:cane_base" | ||
| } |
3 changes: 3 additions & 0 deletions
3
src/main/generated/resources/data/minestuck/weapon_attributes/candy_fork.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| { | ||
| "parent": "minestuck:fork_base" | ||
| } |
3 changes: 3 additions & 0 deletions
3
src/main/generated/resources/data/minestuck/weapon_attributes/cane.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| { | ||
| "parent": "minestuck:cane_base" | ||
| } |
3 changes: 3 additions & 0 deletions
3
...rces/data/minestuck/weapon_attributes/chancewyrms_extra_fortunate_stabbing_implement.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| { | ||
| "parent": "minestuck:cane_base" | ||
| } |
3 changes: 3 additions & 0 deletions
3
...inestuck/weapon_attributes/chancewyrms_extra_fortunate_stabbing_implement_unsheathed.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| { | ||
| "parent": "minestuck:cane_base" | ||
| } |
2 changes: 1 addition & 1 deletion
2
src/main/generated/resources/data/minestuck/weapon_attributes/choco_loco_woodsplitter.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| { | ||
| "parent": "bettercombat:double_axe" | ||
| "parent": "bettercombat:heavy_axe" | ||
| } |
2 changes: 1 addition & 1 deletion
2
src/main/generated/resources/data/minestuck/weapon_attributes/claw_hammer.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| { | ||
| "parent": "bettercombat:hammer" | ||
| "parent": "bettercombat:mace" | ||
| } |
2 changes: 1 addition & 1 deletion
2
src/main/generated/resources/data/minestuck/weapon_attributes/cobalt_sabre.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| { | ||
| "parent": "bettercombat:sword" | ||
| "parent": "bettercombat:cutlass" | ||
| } |
2 changes: 1 addition & 1 deletion
2
src/main/generated/resources/data/minestuck/weapon_attributes/copse_crusher.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| { | ||
| "parent": "bettercombat:heavy_axe" | ||
| "parent": "bettercombat:axe" | ||
| } |
3 changes: 3 additions & 0 deletions
3
src/main/generated/resources/data/minestuck/weapon_attributes/crocker_fork.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| { | ||
| "parent": "minestuck:fork_base" | ||
| } |
2 changes: 1 addition & 1 deletion
2
src/main/generated/resources/data/minestuck/weapon_attributes/crop_chop.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| { | ||
| "parent": "bettercombat:heavy_axe" | ||
| "parent": "bettercombat:axe" | ||
| } |
3 changes: 3 additions & 0 deletions
3
src/main/generated/resources/data/minestuck/weapon_attributes/crowbar.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| { | ||
| "parent": "bettercombat:heavy_axe" | ||
| } |
2 changes: 1 addition & 1 deletion
2
src/main/generated/resources/data/minestuck/weapon_attributes/cruel_fate_crucible.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| { | ||
| "parent": "bettercombat:sword" | ||
| "parent": "bettercombat:claymore" | ||
| } |
2 changes: 1 addition & 1 deletion
2
src/main/generated/resources/data/minestuck/weapon_attributes/demonbane_ragripper.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| { | ||
| "parent": "bettercombat:heavy_axe" | ||
| "parent": "minestuck:chainsaw_base" | ||
| } |
3 changes: 3 additions & 0 deletions
3
src/main/generated/resources/data/minestuck/weapon_attributes/devil_fork.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| { | ||
| "parent": "minestuck:fork_base" | ||
| } |
2 changes: 1 addition & 1 deletion
2
src/main/generated/resources/data/minestuck/weapon_attributes/devils_delight.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| { | ||
| "parent": "bettercombat:heavy_axe" | ||
| "parent": "minestuck:chainsaw_base" | ||
| } |
3 changes: 3 additions & 0 deletions
3
src/main/generated/resources/data/minestuck/weapon_attributes/double_ended_trident.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| { | ||
| "parent": "bettercombat:trident" | ||
| } |
3 changes: 3 additions & 0 deletions
3
src/main/generated/resources/data/minestuck/weapon_attributes/dragon_cane.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| { | ||
| "parent": "minestuck:cane_base" | ||
| } |
3 changes: 3 additions & 0 deletions
3
src/main/generated/resources/data/minestuck/weapon_attributes/dragon_cane_unsheathed.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| { | ||
| "parent": "minestuck:cane_base" | ||
| } |
3 changes: 3 additions & 0 deletions
3
src/main/generated/resources/data/minestuck/weapon_attributes/eating_fork_gem.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| { | ||
| "parent": "minestuck:fork_base" | ||
| } |
3 changes: 3 additions & 0 deletions
3
src/main/generated/resources/data/minestuck/weapon_attributes/edisons_fury.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| { | ||
| "parent": "minestuck:fork_base" | ||
| } |
3 changes: 3 additions & 0 deletions
3
src/main/generated/resources/data/minestuck/weapon_attributes/edisons_serenity.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| { | ||
| "parent": "minestuck:fork_base" | ||
| } |
3 changes: 3 additions & 0 deletions
3
src/main/generated/resources/data/minestuck/weapon_attributes/electric_fork.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| { | ||
| "parent": "minestuck:fork_base" | ||
| } |
2 changes: 1 addition & 1 deletion
2
src/main/generated/resources/data/minestuck/weapon_attributes/emerald_immolator.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| { | ||
| "parent": "bettercombat:heavy_axe" | ||
| "parent": "minestuck:chainsaw_base" | ||
| } |
2 changes: 1 addition & 1 deletion
2
src/main/generated/resources/data/minestuck/weapon_attributes/fine_china_axe.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| { | ||
| "parent": "bettercombat:double_axe" | ||
| "parent": "bettercombat:heavy_axe" | ||
| } |
2 changes: 1 addition & 1 deletion
2
...in/generated/resources/data/minestuck/weapon_attributes/fission_focused_fault_feller.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| { | ||
| "parent": "bettercombat:double_axe" | ||
| "parent": "bettercombat:heavy_axe" | ||
| } |
3 changes: 3 additions & 0 deletions
3
src/main/generated/resources/data/minestuck/weapon_attributes/fork.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| { | ||
| "parent": "minestuck:fork_base" | ||
| } |
2 changes: 1 addition & 1 deletion
2
src/main/generated/resources/data/minestuck/weapon_attributes/frosttooth.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| { | ||
| "parent": "bettercombat:heavy_axe" | ||
| "parent": "minestuck:chainsaw_base" | ||
| } |
2 changes: 1 addition & 1 deletion
2
src/main/generated/resources/data/minestuck/weapon_attributes/frosty_macuahuitl.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| { | ||
| "parent": "bettercombat:cutlass" | ||
| "parent": "bettercombat:claymore" | ||
| } |
2 changes: 1 addition & 1 deletion
2
src/main/generated/resources/data/minestuck/weapon_attributes/gothy_axe.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| { | ||
| "parent": "bettercombat:heavy_axe" | ||
| "parent": "bettercombat:axe" | ||
| } |
2 changes: 1 addition & 1 deletion
2
...ain/generated/resources/data/minestuck/weapon_attributes/hand_cranked_vampire_eraser.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| { | ||
| "parent": "bettercombat:heavy_axe" | ||
| "parent": "minestuck:chainsaw_base" | ||
| } |
2 changes: 1 addition & 1 deletion
2
src/main/generated/resources/data/minestuck/weapon_attributes/hephaestus_lumberjack.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| { | ||
| "parent": "bettercombat:heavy_axe" | ||
| "parent": "bettercombat:axe" | ||
| } |
3 changes: 3 additions & 0 deletions
3
src/main/generated/resources/data/minestuck/weapon_attributes/iron_cane.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| { | ||
| "parent": "minestuck:cane_base" | ||
| } |
3 changes: 3 additions & 0 deletions
3
src/main/generated/resources/data/minestuck/weapon_attributes/kissy_cutie_heart_hitter.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| { | ||
| "parent": "minestuck:cane_base" | ||
| } |
3 changes: 3 additions & 0 deletions
3
src/main/generated/resources/data/minestuck/weapon_attributes/less_proper_walking_stick.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| { | ||
| "parent": "minestuck:cane_base" | ||
| } |
2 changes: 1 addition & 1 deletion
2
src/main/generated/resources/data/minestuck/weapon_attributes/lipstick_chainsaw.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| { | ||
| "parent": "bettercombat:heavy_axe" | ||
| "parent": "minestuck:chainsaw_base" | ||
| } |
2 changes: 1 addition & 1 deletion
2
...ain/generated/resources/data/minestuck/weapon_attributes/lorentz_distransformationer.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| { | ||
| "parent": "bettercombat:heavy_axe" | ||
| "parent": "bettercombat:axe" | ||
| } |
2 changes: 1 addition & 1 deletion
2
src/main/generated/resources/data/minestuck/weapon_attributes/macuahuitl.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| { | ||
| "parent": "bettercombat:cutlass" | ||
| "parent": "bettercombat:claymore" | ||
| } |
2 changes: 1 addition & 1 deletion
2
src/main/generated/resources/data/minestuck/weapon_attributes/magenta_mauler.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| { | ||
| "parent": "bettercombat:heavy_axe" | ||
| "parent": "minestuck:chainsaw_base" | ||
| } |
3 changes: 3 additions & 0 deletions
3
src/main/generated/resources/data/minestuck/weapon_attributes/meatfork.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| { | ||
| "parent": "bettercombat:trident" | ||
| } |
2 changes: 1 addition & 1 deletion
2
src/main/generated/resources/data/minestuck/weapon_attributes/melonsbane.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| { | ||
| "parent": "bettercombat:heavy_axe" | ||
| "parent": "bettercombat:axe" | ||
| } |
3 changes: 3 additions & 0 deletions
3
src/main/generated/resources/data/minestuck/weapon_attributes/mutant_cutie_cell_putter.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| { | ||
| "parent": "minestuck:cane_base" | ||
| } |
2 changes: 1 addition & 1 deletion
2
src/main/generated/resources/data/minestuck/weapon_attributes/obsidiator.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| { | ||
| "parent": "bettercombat:heavy_axe" | ||
| "parent": "minestuck:chainsaw_base" | ||
| } |
3 changes: 3 additions & 0 deletions
3
src/main/generated/resources/data/minestuck/weapon_attributes/paradises_portabello.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| { | ||
| "parent": "minestuck:cane_base" | ||
| } |
2 changes: 1 addition & 1 deletion
2
...n/generated/resources/data/minestuck/weapon_attributes/piston_powered_pogo_axehammer.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| { | ||
| "parent": "bettercombat:double_axe" | ||
| "parent": "bettercombat:heavy_axe" | ||
| } |
3 changes: 3 additions & 0 deletions
3
src/main/generated/resources/data/minestuck/weapon_attributes/pogo_cane.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| { | ||
| "parent": "minestuck:cane_base" | ||
| } |
3 changes: 3 additions & 0 deletions
3
...in/generated/resources/data/minestuck/weapon_attributes/prim_and_proper_walking_pole.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| { | ||
| "parent": "minestuck:cane_base" | ||
| } |
2 changes: 1 addition & 1 deletion
2
src/main/generated/resources/data/minestuck/weapon_attributes/quench_crusher.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| { | ||
| "parent": "bettercombat:heavy_axe" | ||
| "parent": "bettercombat:axe" | ||
| } |
3 changes: 3 additions & 0 deletions
3
src/main/generated/resources/data/minestuck/weapon_attributes/regi_cane.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| { | ||
| "parent": "minestuck:cane_base" | ||
| } |
2 changes: 1 addition & 1 deletion
2
src/main/generated/resources/data/minestuck/weapon_attributes/regiaxe.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| { | ||
| "parent": "bettercombat:heavy_axe" | ||
| "parent": "bettercombat:axe" | ||
| } |
3 changes: 3 additions & 0 deletions
3
.../generated/resources/data/minestuck/weapon_attributes/rockefellers_walking_bladecane.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| { | ||
| "parent": "minestuck:cane_base" | ||
| } |
2 changes: 1 addition & 1 deletion
2
src/main/generated/resources/data/minestuck/weapon_attributes/ruby_croak.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| { | ||
| "parent": "bettercombat:heavy_axe" | ||
| "parent": "bettercombat:axe" | ||
| } |
2 changes: 1 addition & 1 deletion
2
src/main/generated/resources/data/minestuck/weapon_attributes/scarlet_zillyhoo.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| { | ||
| "parent": "bettercombat:cutlass" | ||
| "parent": "bettercombat:hammer" | ||
| } |
2 changes: 1 addition & 1 deletion
2
src/main/generated/resources/data/minestuck/weapon_attributes/scraxe.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| { | ||
| "parent": "bettercombat:heavy_axe" | ||
| "parent": "bettercombat:axe" | ||
| } |
3 changes: 3 additions & 0 deletions
3
src/main/generated/resources/data/minestuck/weapon_attributes/sharp_candy_cane.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| { | ||
| "parent": "minestuck:cane_base" | ||
| } |
2 changes: 1 addition & 1 deletion
2
src/main/generated/resources/data/minestuck/weapon_attributes/shock_axe.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| { | ||
| "parent": "bettercombat:heavy_axe" | ||
| "parent": "bettercombat:axe" | ||
| } |
2 changes: 1 addition & 1 deletion
2
src/main/generated/resources/data/minestuck/weapon_attributes/shock_axe_unpowered.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| { | ||
| "parent": "bettercombat:heavy_axe" | ||
| "parent": "bettercombat:axe" | ||
| } |
3 changes: 3 additions & 0 deletions
3
src/main/generated/resources/data/minestuck/weapon_attributes/sightseeker.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| { | ||
| "parent": "minestuck:fork_base" | ||
| } |
3 changes: 3 additions & 0 deletions
3
src/main/generated/resources/data/minestuck/weapon_attributes/skaia_fork.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| { | ||
| "parent": "minestuck:fork_base" | ||
| } |
3 changes: 3 additions & 0 deletions
3
src/main/generated/resources/data/minestuck/weapon_attributes/skaian_crocker_rocker.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| { | ||
| "parent": "minestuck:fork_base" | ||
| } |
2 changes: 1 addition & 1 deletion
2
src/main/generated/resources/data/minestuck/weapon_attributes/steel_edge_candycutter.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| { | ||
| "parent": "bettercombat:double_axe" | ||
| "parent": "bettercombat:heavy_axe" | ||
| } |
2 changes: 1 addition & 1 deletion
2
...erated/resources/data/minestuck/weapon_attributes/subtractshumidire_zomorrodnegative.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| { | ||
| "parent": "bettercombat:sword" | ||
| "parent": "bettercombat:claymore" | ||
| } |
Oops, something went wrong.