Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
@Waterpicker
Waterpicker committed Dec 31, 2024
2 parents 8b7f2e9 + db126c9 commit 4951526
Show file tree
Hide file tree
Showing 2 changed files with 134 additions and 0 deletions.
99 changes: 99 additions & 0 deletions common/src/main/generated/resources/data/minecraft/tags/blocks/mineable/axe.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
"generations_core:cursed_carved_pumpkin",
"generations_core:scarecrow",
"generations_core:box",
<<<<<<< HEAD
"generations_core:orange_couch_arm_left",
"generations_core:white_couch_arm_left",
"generations_core:red_couch_arm_left",
Expand Down Expand Up @@ -143,14 +144,112 @@
"generations_core:green_couch_ottoman",
"generations_core:yellow_couch_ottoman",
"generations_core:light_gray_couch_ottoman",
=======
"generations_core:yellow_couch_arm_left",
"generations_core:white_couch_arm_left",
"generations_core:light_gray_couch_arm_left",
"generations_core:black_couch_arm_left",
"generations_core:light_blue_couch_arm_left",
"generations_core:blue_couch_arm_left",
"generations_core:pink_couch_arm_left",
"generations_core:green_couch_arm_left",
"generations_core:lime_couch_arm_left",
"generations_core:purple_couch_arm_left",
"generations_core:orange_couch_arm_left",
"generations_core:red_couch_arm_left",
"generations_core:brown_couch_arm_left",
"generations_core:gray_couch_arm_left",
"generations_core:cyan_couch_arm_left",
"generations_core:magenta_couch_arm_left",
"generations_core:yellow_couch_arm_right",
"generations_core:white_couch_arm_right",
"generations_core:light_gray_couch_arm_right",
"generations_core:black_couch_arm_right",
"generations_core:light_blue_couch_arm_right",
"generations_core:blue_couch_arm_right",
"generations_core:pink_couch_arm_right",
"generations_core:green_couch_arm_right",
"generations_core:lime_couch_arm_right",
"generations_core:purple_couch_arm_right",
"generations_core:orange_couch_arm_right",
"generations_core:red_couch_arm_right",
"generations_core:brown_couch_arm_right",
"generations_core:gray_couch_arm_right",
"generations_core:cyan_couch_arm_right",
"generations_core:magenta_couch_arm_right",
"generations_core:yellow_couch_corner_left",
"generations_core:white_couch_corner_left",
"generations_core:light_gray_couch_corner_left",
"generations_core:black_couch_corner_left",
"generations_core:light_blue_couch_corner_left",
"generations_core:blue_couch_corner_left",
"generations_core:pink_couch_corner_left",
"generations_core:green_couch_corner_left",
"generations_core:lime_couch_corner_left",
"generations_core:purple_couch_corner_left",
"generations_core:orange_couch_corner_left",
"generations_core:red_couch_corner_left",
"generations_core:brown_couch_corner_left",
"generations_core:gray_couch_corner_left",
"generations_core:cyan_couch_corner_left",
"generations_core:magenta_couch_corner_left",
"generations_core:yellow_couch_corner_right",
"generations_core:white_couch_corner_right",
"generations_core:light_gray_couch_corner_right",
"generations_core:black_couch_corner_right",
"generations_core:light_blue_couch_corner_right",
"generations_core:blue_couch_corner_right",
"generations_core:pink_couch_corner_right",
"generations_core:green_couch_corner_right",
"generations_core:lime_couch_corner_right",
"generations_core:purple_couch_corner_right",
"generations_core:orange_couch_corner_right",
"generations_core:red_couch_corner_right",
"generations_core:brown_couch_corner_right",
"generations_core:gray_couch_corner_right",
"generations_core:cyan_couch_corner_right",
"generations_core:magenta_couch_corner_right",
"generations_core:yellow_couch_middle",
"generations_core:white_couch_middle",
"generations_core:light_gray_couch_middle",
"generations_core:black_couch_middle",
"generations_core:light_blue_couch_middle",
"generations_core:blue_couch_middle",
"generations_core:pink_couch_middle",
"generations_core:green_couch_middle",
"generations_core:lime_couch_middle",
"generations_core:purple_couch_middle",
"generations_core:orange_couch_middle",
"generations_core:red_couch_middle",
"generations_core:brown_couch_middle",
"generations_core:gray_couch_middle",
"generations_core:cyan_couch_middle",
"generations_core:magenta_couch_middle",
"generations_core:yellow_couch_ottoman",
"generations_core:white_couch_ottoman",
"generations_core:light_gray_couch_ottoman",
"generations_core:black_couch_ottoman",
"generations_core:light_blue_couch_ottoman",
"generations_core:blue_couch_ottoman",
>>>>>>> origin/master
"generations_core:pink_couch_ottoman",
"generations_core:green_couch_ottoman",
"generations_core:lime_couch_ottoman",
"generations_core:purple_couch_ottoman",
"generations_core:orange_couch_ottoman",
"generations_core:red_couch_ottoman",
"generations_core:brown_couch_ottoman",
"generations_core:gray_couch_ottoman",
"generations_core:cyan_couch_ottoman",
<<<<<<< HEAD
"generations_core:black_couch_ottoman",
"generations_core:lime_couch_ottoman",
"generations_core:purple_couch_ottoman",
"generations_core:brown_couch_ottoman",
"generations_core:magenta_couch_ottoman",
"generations_core:light_blue_couch_ottoman"
=======
"generations_core:magenta_couch_ottoman"
>>>>>>> origin/master
]
}
35 changes: 35 additions & 0 deletions common/src/main/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -802,6 +802,7 @@
"generations_core:pink_elevator",
"generations_core:desk",
"generations_core:fridge",
<<<<<<< HEAD
"generations_core:orange_street_lamp",
"generations_core:white_street_lamp",
"generations_core:red_street_lamp",
Expand Down Expand Up @@ -834,6 +835,40 @@
"generations_core:brown_pc",
"generations_core:magenta_pc",
"generations_core:light_blue_pc",
=======
"generations_core:yellow_street_lamp",
"generations_core:white_street_lamp",
"generations_core:light_gray_street_lamp",
"generations_core:black_street_lamp",
"generations_core:light_blue_street_lamp",
"generations_core:blue_street_lamp",
"generations_core:pink_street_lamp",
"generations_core:green_street_lamp",
"generations_core:lime_street_lamp",
"generations_core:purple_street_lamp",
"generations_core:orange_street_lamp",
"generations_core:red_street_lamp",
"generations_core:brown_street_lamp",
"generations_core:gray_street_lamp",
"generations_core:cyan_street_lamp",
"generations_core:magenta_street_lamp",
"generations_core:yellow_pc",
"generations_core:white_pc",
"generations_core:light_gray_pc",
"generations_core:black_pc",
"generations_core:light_blue_pc",
"generations_core:blue_pc",
"generations_core:pink_pc",
"generations_core:green_pc",
"generations_core:lime_pc",
"generations_core:purple_pc",
"generations_core:orange_pc",
"generations_core:red_pc",
"generations_core:brown_pc",
"generations_core:gray_pc",
"generations_core:cyan_pc",
"generations_core:magenta_pc",
>>>>>>> origin/master
"generations_core:empty_ball_display",
"generations_core:poke_ball_display",
"generations_core:great_ball_display",
Expand Down

0 comments on commit 4951526

Please sign in to comment.