Skip to content

Commit f86da01

Browse files
committed
Box.
1 parent e15a739 commit f86da01

4 files changed

Lines changed: 84 additions & 81 deletions

File tree

  • common/src/main
    • generated/resources
    • resources/assets/generations_core/textures/item/blocks/utility_blocks
Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
{
2-
"parent": "generations_core:block/utility_blocks/box_closed"
2+
"parent": "minecraft:item/generated",
3+
"textures": {
4+
"layer0": "generations_core:item/blocks/utility_blocks/box"
5+
}
36
}

common/src/main/generated/resources/data/minecraft/tags/blocks/mineable/axe.json

Lines changed: 60 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -56,101 +56,101 @@
5656
"generations_core:cursed_carved_pumpkin",
5757
"generations_core:scarecrow",
5858
"generations_core:box",
59+
"generations_core:white_couch_arm_left",
5960
"generations_core:brown_couch_arm_left",
60-
"generations_core:blue_couch_arm_left",
61-
"generations_core:light_gray_couch_arm_left",
61+
"generations_core:gray_couch_arm_left",
62+
"generations_core:purple_couch_arm_left",
63+
"generations_core:pink_couch_arm_left",
6264
"generations_core:red_couch_arm_left",
65+
"generations_core:orange_couch_arm_left",
6366
"generations_core:black_couch_arm_left",
67+
"generations_core:cyan_couch_arm_left",
6468
"generations_core:light_blue_couch_arm_left",
6569
"generations_core:lime_couch_arm_left",
66-
"generations_core:orange_couch_arm_left",
67-
"generations_core:green_couch_arm_left",
68-
"generations_core:cyan_couch_arm_left",
69-
"generations_core:yellow_couch_arm_left",
70+
"generations_core:light_gray_couch_arm_left",
7071
"generations_core:magenta_couch_arm_left",
71-
"generations_core:gray_couch_arm_left",
72-
"generations_core:white_couch_arm_left",
73-
"generations_core:pink_couch_arm_left",
74-
"generations_core:purple_couch_arm_left",
72+
"generations_core:yellow_couch_arm_left",
73+
"generations_core:blue_couch_arm_left",
74+
"generations_core:green_couch_arm_left",
75+
"generations_core:white_couch_arm_right",
7576
"generations_core:brown_couch_arm_right",
76-
"generations_core:blue_couch_arm_right",
77-
"generations_core:light_gray_couch_arm_right",
77+
"generations_core:gray_couch_arm_right",
78+
"generations_core:purple_couch_arm_right",
79+
"generations_core:pink_couch_arm_right",
7880
"generations_core:red_couch_arm_right",
81+
"generations_core:orange_couch_arm_right",
7982
"generations_core:black_couch_arm_right",
83+
"generations_core:cyan_couch_arm_right",
8084
"generations_core:light_blue_couch_arm_right",
8185
"generations_core:lime_couch_arm_right",
82-
"generations_core:orange_couch_arm_right",
83-
"generations_core:green_couch_arm_right",
84-
"generations_core:cyan_couch_arm_right",
85-
"generations_core:yellow_couch_arm_right",
86+
"generations_core:light_gray_couch_arm_right",
8687
"generations_core:magenta_couch_arm_right",
87-
"generations_core:gray_couch_arm_right",
88-
"generations_core:white_couch_arm_right",
89-
"generations_core:pink_couch_arm_right",
90-
"generations_core:purple_couch_arm_right",
88+
"generations_core:yellow_couch_arm_right",
89+
"generations_core:blue_couch_arm_right",
90+
"generations_core:green_couch_arm_right",
91+
"generations_core:white_couch_corner_left",
9192
"generations_core:brown_couch_corner_left",
92-
"generations_core:blue_couch_corner_left",
93-
"generations_core:light_gray_couch_corner_left",
93+
"generations_core:gray_couch_corner_left",
94+
"generations_core:purple_couch_corner_left",
95+
"generations_core:pink_couch_corner_left",
9496
"generations_core:red_couch_corner_left",
97+
"generations_core:orange_couch_corner_left",
9598
"generations_core:black_couch_corner_left",
99+
"generations_core:cyan_couch_corner_left",
96100
"generations_core:light_blue_couch_corner_left",
97101
"generations_core:lime_couch_corner_left",
98-
"generations_core:orange_couch_corner_left",
99-
"generations_core:green_couch_corner_left",
100-
"generations_core:cyan_couch_corner_left",
101-
"generations_core:yellow_couch_corner_left",
102+
"generations_core:light_gray_couch_corner_left",
102103
"generations_core:magenta_couch_corner_left",
103-
"generations_core:gray_couch_corner_left",
104-
"generations_core:white_couch_corner_left",
105-
"generations_core:pink_couch_corner_left",
106-
"generations_core:purple_couch_corner_left",
104+
"generations_core:yellow_couch_corner_left",
105+
"generations_core:blue_couch_corner_left",
106+
"generations_core:green_couch_corner_left",
107+
"generations_core:white_couch_corner_right",
107108
"generations_core:brown_couch_corner_right",
108-
"generations_core:blue_couch_corner_right",
109-
"generations_core:light_gray_couch_corner_right",
109+
"generations_core:gray_couch_corner_right",
110+
"generations_core:purple_couch_corner_right",
111+
"generations_core:pink_couch_corner_right",
110112
"generations_core:red_couch_corner_right",
113+
"generations_core:orange_couch_corner_right",
111114
"generations_core:black_couch_corner_right",
115+
"generations_core:cyan_couch_corner_right",
112116
"generations_core:light_blue_couch_corner_right",
113117
"generations_core:lime_couch_corner_right",
114-
"generations_core:orange_couch_corner_right",
115-
"generations_core:green_couch_corner_right",
116-
"generations_core:cyan_couch_corner_right",
117-
"generations_core:yellow_couch_corner_right",
118+
"generations_core:light_gray_couch_corner_right",
118119
"generations_core:magenta_couch_corner_right",
119-
"generations_core:gray_couch_corner_right",
120-
"generations_core:white_couch_corner_right",
121-
"generations_core:pink_couch_corner_right",
122-
"generations_core:purple_couch_corner_right",
120+
"generations_core:yellow_couch_corner_right",
121+
"generations_core:blue_couch_corner_right",
122+
"generations_core:green_couch_corner_right",
123+
"generations_core:white_couch_middle",
123124
"generations_core:brown_couch_middle",
124-
"generations_core:blue_couch_middle",
125-
"generations_core:light_gray_couch_middle",
125+
"generations_core:gray_couch_middle",
126+
"generations_core:purple_couch_middle",
127+
"generations_core:pink_couch_middle",
126128
"generations_core:red_couch_middle",
129+
"generations_core:orange_couch_middle",
127130
"generations_core:black_couch_middle",
131+
"generations_core:cyan_couch_middle",
128132
"generations_core:light_blue_couch_middle",
129133
"generations_core:lime_couch_middle",
130-
"generations_core:orange_couch_middle",
131-
"generations_core:green_couch_middle",
132-
"generations_core:cyan_couch_middle",
133-
"generations_core:yellow_couch_middle",
134+
"generations_core:light_gray_couch_middle",
134135
"generations_core:magenta_couch_middle",
135-
"generations_core:gray_couch_middle",
136-
"generations_core:white_couch_middle",
137-
"generations_core:pink_couch_middle",
138-
"generations_core:purple_couch_middle",
136+
"generations_core:yellow_couch_middle",
137+
"generations_core:blue_couch_middle",
138+
"generations_core:green_couch_middle",
139+
"generations_core:white_couch_ottoman",
139140
"generations_core:brown_couch_ottoman",
140-
"generations_core:blue_couch_ottoman",
141-
"generations_core:light_gray_couch_ottoman",
141+
"generations_core:gray_couch_ottoman",
142+
"generations_core:purple_couch_ottoman",
143+
"generations_core:pink_couch_ottoman",
142144
"generations_core:red_couch_ottoman",
145+
"generations_core:orange_couch_ottoman",
143146
"generations_core:black_couch_ottoman",
147+
"generations_core:cyan_couch_ottoman",
144148
"generations_core:light_blue_couch_ottoman",
145149
"generations_core:lime_couch_ottoman",
146-
"generations_core:orange_couch_ottoman",
147-
"generations_core:green_couch_ottoman",
148-
"generations_core:cyan_couch_ottoman",
149-
"generations_core:yellow_couch_ottoman",
150+
"generations_core:light_gray_couch_ottoman",
150151
"generations_core:magenta_couch_ottoman",
151-
"generations_core:gray_couch_ottoman",
152-
"generations_core:white_couch_ottoman",
153-
"generations_core:pink_couch_ottoman",
154-
"generations_core:purple_couch_ottoman"
152+
"generations_core:yellow_couch_ottoman",
153+
"generations_core:blue_couch_ottoman",
154+
"generations_core:green_couch_ottoman"
155155
]
156156
}

common/src/main/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -804,38 +804,38 @@
804804
"generations_core:pink_elevator",
805805
"generations_core:desk",
806806
"generations_core:fridge",
807+
"generations_core:white_street_lamp",
807808
"generations_core:brown_street_lamp",
808-
"generations_core:blue_street_lamp",
809-
"generations_core:light_gray_street_lamp",
809+
"generations_core:gray_street_lamp",
810+
"generations_core:purple_street_lamp",
811+
"generations_core:pink_street_lamp",
810812
"generations_core:red_street_lamp",
813+
"generations_core:orange_street_lamp",
811814
"generations_core:black_street_lamp",
815+
"generations_core:cyan_street_lamp",
812816
"generations_core:light_blue_street_lamp",
813817
"generations_core:lime_street_lamp",
814-
"generations_core:orange_street_lamp",
815-
"generations_core:green_street_lamp",
816-
"generations_core:cyan_street_lamp",
817-
"generations_core:yellow_street_lamp",
818+
"generations_core:light_gray_street_lamp",
818819
"generations_core:magenta_street_lamp",
819-
"generations_core:gray_street_lamp",
820-
"generations_core:white_street_lamp",
821-
"generations_core:pink_street_lamp",
822-
"generations_core:purple_street_lamp",
820+
"generations_core:yellow_street_lamp",
821+
"generations_core:blue_street_lamp",
822+
"generations_core:green_street_lamp",
823+
"generations_core:white_pc",
823824
"generations_core:brown_pc",
824-
"generations_core:blue_pc",
825-
"generations_core:light_gray_pc",
825+
"generations_core:gray_pc",
826+
"generations_core:purple_pc",
827+
"generations_core:pink_pc",
826828
"generations_core:red_pc",
829+
"generations_core:orange_pc",
827830
"generations_core:black_pc",
831+
"generations_core:cyan_pc",
828832
"generations_core:light_blue_pc",
829833
"generations_core:lime_pc",
830-
"generations_core:orange_pc",
831-
"generations_core:green_pc",
832-
"generations_core:cyan_pc",
833-
"generations_core:yellow_pc",
834+
"generations_core:light_gray_pc",
834835
"generations_core:magenta_pc",
835-
"generations_core:gray_pc",
836-
"generations_core:white_pc",
837-
"generations_core:pink_pc",
838-
"generations_core:purple_pc",
836+
"generations_core:yellow_pc",
837+
"generations_core:blue_pc",
838+
"generations_core:green_pc",
839839
"generations_core:empty_ball_display",
840840
"generations_core:poke_ball_display",
841841
"generations_core:great_ball_display",
285 Bytes
Loading

0 commit comments

Comments
 (0)