Skip to content

Commit 0a17e27

Browse files
committed
Data gen seems to be stable. :3
1 parent abe0cb2 commit 0a17e27

9,625 files changed

Lines changed: 99044 additions & 118326 deletions

File tree

Some content is hidden

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

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

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1865,7 +1865,6 @@
18651865
"item.generations_core.effort_ribbon": "Effort Ribbon",
18661866
"item.generations_core.electric_candy": "Electric Candy",
18671867
"item.generations_core.electric_memory_drive": "Electric Memory Drive",
1868-
"item.generations_core.electric_seed": "Electric Seed",
18691868
"item.generations_core.electrium_z": "Electrium Z",
18701869
"item.generations_core.elegant_wing": "Elegant Wing",
18711870
"item.generations_core.eleki_key": "Eleki Key",
@@ -2017,7 +2016,6 @@
20172016
"item.generations_core.grass_candy": "Grass Candy",
20182017
"item.generations_core.grass_memory_drive": "Grass Memory Drive",
20192018
"item.generations_core.grassium_z": "Grassium Z",
2020-
"item.generations_core.grassy_seed": "Grassy Seed",
20212019
"item.generations_core.great_ability_ribbon": "Great Ability Ribbon",
20222020
"item.generations_core.great_walkmon": "Great Walkmon",
20232021
"item.generations_core.green_juice": "Green Juice",
@@ -2280,7 +2278,6 @@
22802278
"item.generations_core.meteorite.tooltip": "§7HINT: Strange, otherworldly energy is coming from this item. Try enchanting it and charging it by defeating Pokemon of a relevant type.",
22812279
"item.generations_core.meteorite_shard": "Meteorite Shard",
22822280
"item.generations_core.meteorite_shard.tooltip": "§7HINT: Maybe if you collect enough you could craft something from out of this world.",
2283-
"item.generations_core.metronome": "Metronome",
22842281
"item.generations_core.mew_dna_fiber": "Mew Dna Fiber",
22852282
"item.generations_core.mew_dna_fiber.tooltip": "§7HINT: DNA may be manipulated in an RKS Machine.",
22862283
"item.generations_core.mew_fossil": "Mew Fossil",
@@ -2302,7 +2299,6 @@
23022299
"item.generations_core.mineral_badge": "Mineral Badge",
23032300
"item.generations_core.mirror": "Mirror",
23042301
"item.generations_core.mirror.tooltip": "§7HINT: Instead of seeing your reflection, you see Gems. They’re pink, blue, and white and laid out in a frame.",
2305-
"item.generations_core.misty_seed": "Misty Seed",
23062302
"item.generations_core.mixed_mushrooms": "Mixed Mushrooms",
23072303
"item.generations_core.moomoo_cheese": "Moomoo Cheese",
23082304
"item.generations_core.moomoo_milk": "Moomoo Milk",
@@ -2526,11 +2522,9 @@
25262522
"item.generations_core.profs_letter.desc": "Not currently implemented",
25272523
"item.generations_core.prop_case": "Prop Case",
25282524
"item.generations_core.prop_case.desc": "Not currently implemented",
2529-
"item.generations_core.protective_pads": "Protective Pads",
25302525
"item.generations_core.psychic_badge": "Psychic Badge",
25312526
"item.generations_core.psychic_candy": "Psychic Candy",
25322527
"item.generations_core.psychic_memory_drive": "Psychic Memory Drive",
2533-
"item.generations_core.psychic_seed": "Psychic Seed",
25342528
"item.generations_core.psychium_z": "Psychium Z",
25352529
"item.generations_core.punching_glove": "Punching Glove",
25362530
"item.generations_core.pungent_root": "Pungent Root",
@@ -2619,7 +2613,6 @@
26192613
"item.generations_core.rockstar_costume": "Rockstar Costume",
26202614
"item.generations_core.roller_skates": "Roller Skates",
26212615
"item.generations_core.roller_skates.desc": "Not currently implemented",
2622-
"item.generations_core.room_service": "Room Service",
26232616
"item.generations_core.rose_incense": "Rose Incense",
26242617
"item.generations_core.roserade_tea": "Roserade Tea",
26252618
"item.generations_core.roto_bargain": "Roto Bargain",
@@ -2694,7 +2687,6 @@
26942687
"item.generations_core.scanner.desc": "Not currently implemented",
26952688
"item.generations_core.sceptilite": "Sceptilite",
26962689
"item.generations_core.scizorite": "Scizorite",
2697-
"item.generations_core.scope_lens": "Scope Lens",
26982690
"item.generations_core.scroll_page": "Scroll Page",
26992691
"item.generations_core.scroll_page.tooltip": "§7HINT: This item is given to masters of the Martial Arts. Gather more pages to complete the scroll and prove your worth.",
27002692
"item.generations_core.sea_incense": "Sea Incense",
@@ -2733,7 +2725,6 @@
27332725
"item.generations_core.shattered_relic_song_3.tooltip": "§7HINT: This appears to be a piece of a music disc. It might be repairable if you obtain all the pieces.",
27342726
"item.generations_core.shattered_relic_song_4": "Shattered Relic Song 4",
27352727
"item.generations_core.shattered_relic_song_4.tooltip": "§7HINT: This appears to be a piece of a music disc. It might be repairable if you obtain all the pieces.",
2736-
"item.generations_core.shed_shell": "Shed Shell",
27372728
"item.generations_core.shoal_salt": "Shoal Salt",
27382729
"item.generations_core.shoal_shell": "Shoal Shell",
27392730
"item.generations_core.shock_drive": "Shock Drive",
@@ -2873,9 +2864,7 @@
28732864
"item.generations_core.teal_mask": "Teal Mask",
28742865
"item.generations_core.team_rocket_disc": "Team Rocket Disc",
28752866
"item.generations_core.team_rocket_disc.desc": "GlitchxCity - Team Rocket",
2876-
"item.generations_core.terrain_extender": "Terrain Extender",
28772867
"item.generations_core.thick_club": "Thick Club",
2878-
"item.generations_core.throat_spray": "Throat Spray",
28792868
"item.generations_core.thunder_badge": "Thunder Badge",
28802869
"item.generations_core.thunder_stone_axe": "Thunder Stone Axe",
28812870
"item.generations_core.thunder_stone_boots": "Thunder Stone Boots",
@@ -3200,13 +3189,13 @@
32003189
"item.generations_core.ultrite_remnant": "Ultrite Remnant",
32013190
"item.generations_core.ultrite_shovel": "Ultrite Shovel",
32023191
"item.generations_core.ultrite_sword": "Ultrite Sword",
3192+
"item.generations_core.ultrite_upgrade_smithing_template": "Ultrite Upgrade Smithing Template",
32033193
"item.generations_core.unova_cap": "Unova Cap",
32043194
"item.generations_core.unova_stone": "Unova Stone",
32053195
"item.generations_core.unova_stone.desc": "Not currently implemented",
32063196
"item.generations_core.unown_report": "Unown Report",
32073197
"item.generations_core.unown_report.desc": "Not currently implemented",
32083198
"item.generations_core.up_grade": "Up Grade",
3209-
"item.generations_core.utility_umbrella": "Utility Umbrella",
32103199
"item.generations_core.venusaurite": "Venusaurite",
32113200
"item.generations_core.vermilion_city_disc": "Vermilion City Disc",
32123201
"item.generations_core.vermilion_city_disc.desc": "GlitchxCity - Vermilion City",
@@ -3244,7 +3233,6 @@
32443233
"item.generations_core.white_flute": "White Flute",
32453234
"item.generations_core.white_mane_hair": "White Mane Hair",
32463235
"item.generations_core.white_mane_hair.tooltip": "§7HINT: This majestic steed requires a generous offering of carrots if you wish to lay your eyes upon them.",
3247-
"item.generations_core.wide_lens": "Wide Lens",
32483236
"item.generations_core.winning_ribbon": "Winning Ribbon",
32493237
"item.generations_core.wishing_chip": "Wishing Chip",
32503238
"item.generations_core.wishing_chip.desc": "Not currently implemented",
@@ -3322,7 +3310,6 @@
33223310
"item.generations_core.zinnia_disc": "Zinnia Disc",
33233311
"item.generations_core.zinnia_disc.desc": "GlitchxCity - Zinnia",
33243312
"item.generations_core.zone_wand": "Zone Wand",
3325-
"item.generations_core.zoom_lens": "Zoom Lens",
33263313
"item.generations_core.zygarde_cube": "Zygarde Cube",
33273314
"item.generations_core.zygarde_cube.tooltip.cell_add": "Zygarde Cell collected!",
33283315
"item.generations_core.zygarde_cube.tooltip.cell_full": "The Zygarde Cube is full!",
@@ -3331,7 +3318,6 @@
33313318
"item.generations_core.zygarde_cube.tooltip.lore2": "as well as fusing them together to reconstruct the legendary Zygarde.",
33323319
"item.generations_core.zygarde_cube.tooltip.lore3": "Collect Zygarde Cells to summon the balance.",
33333320
"item.generations_core.zygarde_cube.tooltip.lore4": "Cells collected: %s/%s",
3334-
"item.minecraft.smithing_template": "Ultrite Upgrade Smithing Template",
33353321
"item.minecraft.smithing_template.ultrite_upgrade.additions_slot_description": "Add Ultrite Ingot",
33363322
"item.minecraft.smithing_template.ultrite_upgrade.applies_to": "Netherite Equipment",
33373323
"item.minecraft.smithing_template.ultrite_upgrade.base_slot_description": "Add Ultrite armor, weapon, or tool",
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"parent": "minecraft:item/generated",
33
"textures": {
4-
"layer0": "generations_core:item/legend_items/dark_crystal"
4+
"layer0": "generations_core:item/placeholder"
55
}
66
}

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
}

0 commit comments

Comments
 (0)