Skip to content

Commit c37cf86

Browse files
Conno2429Conno2429
authored
Cosmetic Form Change Part 2 + Tera Ore + Exp All (#117)
* cosmetic form change, battle conditions ui, tera packet * exp all, more external transformations, 3 31 IVs on legends * fixes to previous commits * a bit of cleanup * tera shard ore + other fixes * wrapping up cosmetic form change + tera ore wip
1 parent 30a5668 commit c37cf86

File tree

656 files changed

+3462
-11575
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

656 files changed

+3462
-11575
lines changed

‎common/src/main/generated/resources/assets/generations_core/blockstates/deepslate_tera_shard_ore.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"variants": {
3+
"": {
4+
"model": "generations_core:block/deepslate_tera_shard_ore"
5+
}
6+
}
7+
}

‎common/src/main/generated/resources/assets/generations_core/blockstates/tera_shard_ore.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"variants": {
3+
"": {
4+
"model": "generations_core:block/tera_shard_ore"
5+
}
6+
}
7+
}

‎common/src/main/generated/resources/assets/generations_core/lang/en_us.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,7 @@
284284
"block.generations_core.deepslate_ruby_ore": "Deepslate Ruby Ore",
285285
"block.generations_core.deepslate_sapphire_ore": "Deepslate Sapphire Ore",
286286
"block.generations_core.deepslate_silicon_ore": "Deepslate Silicon Ore",
287+
"block.generations_core.deepslate_tera_shard_ore": "Deepslate Tera Shard Ore",
287288
"block.generations_core.deepslate_z_crystal_ore": "Deepslate Z Crystal Ore",
288289
"block.generations_core.deoxys_doll": "Deoxys Doll",
289290
"block.generations_core.desk": "Desk",
@@ -1089,6 +1090,7 @@
10891090
"block.generations_core.temple_brick_slab": "Temple Brick Slab",
10901091
"block.generations_core.temple_brick_stairs": "Temple Brick Stairs",
10911092
"block.generations_core.temple_brick_wall": "Temple Brick Wall",
1093+
"block.generations_core.tera_shard_ore": "Tera Shard Ore",
10921094
"block.generations_core.thunder_stone_block": "Thunder Stone Block",
10931095
"block.generations_core.timer_ball_display": "Timer Ball Display",
10941096
"block.generations_core.timer_ball_loot": "Timer Ball Loot",

‎common/src/main/generated/resources/assets/generations_core/models/block/deepslate_tera_shard_ore.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "minecraft:block/cube_all",
3+
"textures": {
4+
"all": "generations_core:block/ores/deepslate_tera_shard_ore"
5+
}
6+
}

‎common/src/main/generated/resources/assets/generations_core/models/block/tera_shard_ore.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "minecraft:block/cube_all",
3+
"textures": {
4+
"all": "generations_core:block/ores/tera_shard_ore"
5+
}
6+
}

‎common/src/main/generated/resources/assets/generations_core/models/item/dawn_stone_boots.json‎

Lines changed: 0 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,5 @@
11
{
22
"parent": "minecraft:item/generated",
3-
"overrides": [
4-
{
5-
"model": "generations_core:item/dawn_stone_boots_quartz_trim",
6-
"predicate": {
7-
"trim_type": 0.1
8-
}
9-
},
10-
{
11-
"model": "generations_core:item/dawn_stone_boots_iron_trim",
12-
"predicate": {
13-
"trim_type": 0.2
14-
}
15-
},
16-
{
17-
"model": "generations_core:item/dawn_stone_boots_netherite_trim",
18-
"predicate": {
19-
"trim_type": 0.3
20-
}
21-
},
22-
{
23-
"model": "generations_core:item/dawn_stone_boots_redstone_trim",
24-
"predicate": {
25-
"trim_type": 0.4
26-
}
27-
},
28-
{
29-
"model": "generations_core:item/dawn_stone_boots_copper_trim",
30-
"predicate": {
31-
"trim_type": 0.5
32-
}
33-
},
34-
{
35-
"model": "generations_core:item/dawn_stone_boots_gold_trim",
36-
"predicate": {
37-
"trim_type": 0.6
38-
}
39-
},
40-
{
41-
"model": "generations_core:item/dawn_stone_boots_emerald_trim",
42-
"predicate": {
43-
"trim_type": 0.7
44-
}
45-
},
46-
{
47-
"model": "generations_core:item/dawn_stone_boots_diamond_trim",
48-
"predicate": {
49-
"trim_type": 0.8
50-
}
51-
},
52-
{
53-
"model": "generations_core:item/dawn_stone_boots_lapis_trim",
54-
"predicate": {
55-
"trim_type": 0.9
56-
}
57-
},
58-
{
59-
"model": "generations_core:item/dawn_stone_boots_amethyst_trim",
60-
"predicate": {
61-
"trim_type": 1.0
62-
}
63-
}
64-
],
653
"textures": {
664
"layer0": "generations_core:item/armor/dawn_stone_boots"
675
}

‎common/src/main/generated/resources/assets/generations_core/models/item/dawn_stone_chestplate.json‎

Lines changed: 0 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,5 @@
11
{
22
"parent": "minecraft:item/generated",
3-
"overrides": [
4-
{
5-
"model": "generations_core:item/dawn_stone_chestplate_quartz_trim",
6-
"predicate": {
7-
"trim_type": 0.1
8-
}
9-
},
10-
{
11-
"model": "generations_core:item/dawn_stone_chestplate_iron_trim",
12-
"predicate": {
13-
"trim_type": 0.2
14-
}
15-
},
16-
{
17-
"model": "generations_core:item/dawn_stone_chestplate_netherite_trim",
18-
"predicate": {
19-
"trim_type": 0.3
20-
}
21-
},
22-
{
23-
"model": "generations_core:item/dawn_stone_chestplate_redstone_trim",
24-
"predicate": {
25-
"trim_type": 0.4
26-
}
27-
},
28-
{
29-
"model": "generations_core:item/dawn_stone_chestplate_copper_trim",
30-
"predicate": {
31-
"trim_type": 0.5
32-
}
33-
},
34-
{
35-
"model": "generations_core:item/dawn_stone_chestplate_gold_trim",
36-
"predicate": {
37-
"trim_type": 0.6
38-
}
39-
},
40-
{
41-
"model": "generations_core:item/dawn_stone_chestplate_emerald_trim",
42-
"predicate": {
43-
"trim_type": 0.7
44-
}
45-
},
46-
{
47-
"model": "generations_core:item/dawn_stone_chestplate_diamond_trim",
48-
"predicate": {
49-
"trim_type": 0.8
50-
}
51-
},
52-
{
53-
"model": "generations_core:item/dawn_stone_chestplate_lapis_trim",
54-
"predicate": {
55-
"trim_type": 0.9
56-
}
57-
},
58-
{
59-
"model": "generations_core:item/dawn_stone_chestplate_amethyst_trim",
60-
"predicate": {
61-
"trim_type": 1.0
62-
}
63-
}
64-
],
653
"textures": {
664
"layer0": "generations_core:item/armor/dawn_stone_chestplate"
675
}

‎common/src/main/generated/resources/assets/generations_core/models/item/dawn_stone_helmet.json‎

Lines changed: 0 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,5 @@
11
{
22
"parent": "minecraft:item/generated",
3-
"overrides": [
4-
{
5-
"model": "generations_core:item/dawn_stone_helmet_quartz_trim",
6-
"predicate": {
7-
"trim_type": 0.1
8-
}
9-
},
10-
{
11-
"model": "generations_core:item/dawn_stone_helmet_iron_trim",
12-
"predicate": {
13-
"trim_type": 0.2
14-
}
15-
},
16-
{
17-
"model": "generations_core:item/dawn_stone_helmet_netherite_trim",
18-
"predicate": {
19-
"trim_type": 0.3
20-
}
21-
},
22-
{
23-
"model": "generations_core:item/dawn_stone_helmet_redstone_trim",
24-
"predicate": {
25-
"trim_type": 0.4
26-
}
27-
},
28-
{
29-
"model": "generations_core:item/dawn_stone_helmet_copper_trim",
30-
"predicate": {
31-
"trim_type": 0.5
32-
}
33-
},
34-
{
35-
"model": "generations_core:item/dawn_stone_helmet_gold_trim",
36-
"predicate": {
37-
"trim_type": 0.6
38-
}
39-
},
40-
{
41-
"model": "generations_core:item/dawn_stone_helmet_emerald_trim",
42-
"predicate": {
43-
"trim_type": 0.7
44-
}
45-
},
46-
{
47-
"model": "generations_core:item/dawn_stone_helmet_diamond_trim",
48-
"predicate": {
49-
"trim_type": 0.8
50-
}
51-
},
52-
{
53-
"model": "generations_core:item/dawn_stone_helmet_lapis_trim",
54-
"predicate": {
55-
"trim_type": 0.9
56-
}
57-
},
58-
{
59-
"model": "generations_core:item/dawn_stone_helmet_amethyst_trim",
60-
"predicate": {
61-
"trim_type": 1.0
62-
}
63-
}
64-
],
653
"textures": {
664
"layer0": "generations_core:item/armor/dawn_stone_helmet"
675
}

‎common/src/main/generated/resources/assets/generations_core/models/item/dawn_stone_leggings.json‎

Lines changed: 0 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,5 @@
11
{
22
"parent": "minecraft:item/generated",
3-
"overrides": [
4-
{
5-
"model": "generations_core:item/dawn_stone_leggings_quartz_trim",
6-
"predicate": {
7-
"trim_type": 0.1
8-
}
9-
},
10-
{
11-
"model": "generations_core:item/dawn_stone_leggings_iron_trim",
12-
"predicate": {
13-
"trim_type": 0.2
14-
}
15-
},
16-
{
17-
"model": "generations_core:item/dawn_stone_leggings_netherite_trim",
18-
"predicate": {
19-
"trim_type": 0.3
20-
}
21-
},
22-
{
23-
"model": "generations_core:item/dawn_stone_leggings_redstone_trim",
24-
"predicate": {
25-
"trim_type": 0.4
26-
}
27-
},
28-
{
29-
"model": "generations_core:item/dawn_stone_leggings_copper_trim",
30-
"predicate": {
31-
"trim_type": 0.5
32-
}
33-
},
34-
{
35-
"model": "generations_core:item/dawn_stone_leggings_gold_trim",
36-
"predicate": {
37-
"trim_type": 0.6
38-
}
39-
},
40-
{
41-
"model": "generations_core:item/dawn_stone_leggings_emerald_trim",
42-
"predicate": {
43-
"trim_type": 0.7
44-
}
45-
},
46-
{
47-
"model": "generations_core:item/dawn_stone_leggings_diamond_trim",
48-
"predicate": {
49-
"trim_type": 0.8
50-
}
51-
},
52-
{
53-
"model": "generations_core:item/dawn_stone_leggings_lapis_trim",
54-
"predicate": {
55-
"trim_type": 0.9
56-
}
57-
},
58-
{
59-
"model": "generations_core:item/dawn_stone_leggings_amethyst_trim",
60-
"predicate": {
61-
"trim_type": 1.0
62-
}
63-
}
64-
],
653
"textures": {
664
"layer0": "generations_core:item/armor/dawn_stone_leggings"
675
}

‎common/src/main/generated/resources/assets/generations_core/models/item/deepslate_tera_shard_ore.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"parent": "generations_core:block/deepslate_tera_shard_ore"
3+
}

0 commit comments

Comments
 (0)