-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
594e43d
commit 7c0cb1a
Showing
388 changed files
with
11,655 additions
and
331 deletions.
There are no files selected for viewing
2 changes: 0 additions & 2 deletions
2
src/generated/resources/.cache/186a7e45361a88b552c7912073ed518df362271c
This file was deleted.
Oops, something went wrong.
2 changes: 0 additions & 2 deletions
2
src/generated/resources/.cache/1dc58ffe3d367c3c4cd8e636dc9c1e808cb57d48
This file was deleted.
Oops, something went wrong.
2 changes: 0 additions & 2 deletions
2
src/generated/resources/.cache/7c45e3a26743e6bc23a95e57dd2dfc0d535855dd
This file was deleted.
Oops, something went wrong.
2 changes: 0 additions & 2 deletions
2
src/generated/resources/.cache/dd7a2de88d5e2bc9952141ad41dd64dd256819dd
This file was deleted.
Oops, something went wrong.
4 changes: 0 additions & 4 deletions
4
src/generated/resources/.cache/f7a5848ef36663c31e497ab9c2542cab6060a2e2
This file was deleted.
Oops, something went wrong.
7 changes: 0 additions & 7 deletions
7
src/generated/resources/assets/examplemod/blockstates/example_block.json
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
3 changes: 0 additions & 3 deletions
3
src/generated/resources/assets/examplemod/models/item/example_block.json
This file was deleted.
Oops, something went wrong.
34 changes: 34 additions & 0 deletions
34
src/generated/resources/assets/usefulmachinery/blockstates/coal_generator.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,34 @@ | ||
| { | ||
| "variants": { | ||
| "facing=east,lit=false": { | ||
| "model": "usefulmachinery:block/coal_generator", | ||
| "y": 90 | ||
| }, | ||
| "facing=east,lit=true": { | ||
| "model": "usefulmachinery:block/coal_generator_on", | ||
| "y": 90 | ||
| }, | ||
| "facing=north,lit=false": { | ||
| "model": "usefulmachinery:block/coal_generator" | ||
| }, | ||
| "facing=north,lit=true": { | ||
| "model": "usefulmachinery:block/coal_generator_on" | ||
| }, | ||
| "facing=south,lit=false": { | ||
| "model": "usefulmachinery:block/coal_generator", | ||
| "y": 180 | ||
| }, | ||
| "facing=south,lit=true": { | ||
| "model": "usefulmachinery:block/coal_generator_on", | ||
| "y": 180 | ||
| }, | ||
| "facing=west,lit=false": { | ||
| "model": "usefulmachinery:block/coal_generator", | ||
| "y": 270 | ||
| }, | ||
| "facing=west,lit=true": { | ||
| "model": "usefulmachinery:block/coal_generator_on", | ||
| "y": 270 | ||
| } | ||
| } | ||
| } |
34 changes: 34 additions & 0 deletions
34
src/generated/resources/assets/usefulmachinery/blockstates/compactor.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,34 @@ | ||
| { | ||
| "variants": { | ||
| "facing=east,lit=false": { | ||
| "model": "usefulmachinery:block/compactor", | ||
| "y": 90 | ||
| }, | ||
| "facing=east,lit=true": { | ||
| "model": "usefulmachinery:block/compactor_on", | ||
| "y": 90 | ||
| }, | ||
| "facing=north,lit=false": { | ||
| "model": "usefulmachinery:block/compactor" | ||
| }, | ||
| "facing=north,lit=true": { | ||
| "model": "usefulmachinery:block/compactor_on" | ||
| }, | ||
| "facing=south,lit=false": { | ||
| "model": "usefulmachinery:block/compactor", | ||
| "y": 180 | ||
| }, | ||
| "facing=south,lit=true": { | ||
| "model": "usefulmachinery:block/compactor_on", | ||
| "y": 180 | ||
| }, | ||
| "facing=west,lit=false": { | ||
| "model": "usefulmachinery:block/compactor", | ||
| "y": 270 | ||
| }, | ||
| "facing=west,lit=true": { | ||
| "model": "usefulmachinery:block/compactor_on", | ||
| "y": 270 | ||
| } | ||
| } | ||
| } |
7 changes: 7 additions & 0 deletions
7
src/generated/resources/assets/usefulmachinery/blockstates/creative_power_cell.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,7 @@ | ||
| { | ||
| "variants": { | ||
| "": { | ||
| "model": "usefulmachinery:block/redstone_block" | ||
| } | ||
| } | ||
| } |
34 changes: 34 additions & 0 deletions
34
src/generated/resources/assets/usefulmachinery/blockstates/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 |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| { | ||
| "variants": { | ||
| "facing=east,lit=false": { | ||
| "model": "usefulmachinery:block/crusher", | ||
| "y": 90 | ||
| }, | ||
| "facing=east,lit=true": { | ||
| "model": "usefulmachinery:block/crusher_on", | ||
| "y": 90 | ||
| }, | ||
| "facing=north,lit=false": { | ||
| "model": "usefulmachinery:block/crusher" | ||
| }, | ||
| "facing=north,lit=true": { | ||
| "model": "usefulmachinery:block/crusher_on" | ||
| }, | ||
| "facing=south,lit=false": { | ||
| "model": "usefulmachinery:block/crusher", | ||
| "y": 180 | ||
| }, | ||
| "facing=south,lit=true": { | ||
| "model": "usefulmachinery:block/crusher_on", | ||
| "y": 180 | ||
| }, | ||
| "facing=west,lit=false": { | ||
| "model": "usefulmachinery:block/crusher", | ||
| "y": 270 | ||
| }, | ||
| "facing=west,lit=true": { | ||
| "model": "usefulmachinery:block/crusher_on", | ||
| "y": 270 | ||
| } | ||
| } | ||
| } |
34 changes: 34 additions & 0 deletions
34
src/generated/resources/assets/usefulmachinery/blockstates/electric_smelter.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,34 @@ | ||
| { | ||
| "variants": { | ||
| "facing=east,lit=false": { | ||
| "model": "usefulmachinery:block/electric_smelter", | ||
| "y": 90 | ||
| }, | ||
| "facing=east,lit=true": { | ||
| "model": "usefulmachinery:block/electric_smelter_on", | ||
| "y": 90 | ||
| }, | ||
| "facing=north,lit=false": { | ||
| "model": "usefulmachinery:block/electric_smelter" | ||
| }, | ||
| "facing=north,lit=true": { | ||
| "model": "usefulmachinery:block/electric_smelter_on" | ||
| }, | ||
| "facing=south,lit=false": { | ||
| "model": "usefulmachinery:block/electric_smelter", | ||
| "y": 180 | ||
| }, | ||
| "facing=south,lit=true": { | ||
| "model": "usefulmachinery:block/electric_smelter_on", | ||
| "y": 180 | ||
| }, | ||
| "facing=west,lit=false": { | ||
| "model": "usefulmachinery:block/electric_smelter", | ||
| "y": 270 | ||
| }, | ||
| "facing=west,lit=true": { | ||
| "model": "usefulmachinery:block/electric_smelter_on", | ||
| "y": 270 | ||
| } | ||
| } | ||
| } |
34 changes: 34 additions & 0 deletions
34
src/generated/resources/assets/usefulmachinery/blockstates/lava_generator.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,34 @@ | ||
| { | ||
| "variants": { | ||
| "facing=east,lit=false": { | ||
| "model": "usefulmachinery:block/lava_generator", | ||
| "y": 90 | ||
| }, | ||
| "facing=east,lit=true": { | ||
| "model": "usefulmachinery:block/lava_generator_on", | ||
| "y": 90 | ||
| }, | ||
| "facing=north,lit=false": { | ||
| "model": "usefulmachinery:block/lava_generator" | ||
| }, | ||
| "facing=north,lit=true": { | ||
| "model": "usefulmachinery:block/lava_generator_on" | ||
| }, | ||
| "facing=south,lit=false": { | ||
| "model": "usefulmachinery:block/lava_generator", | ||
| "y": 180 | ||
| }, | ||
| "facing=south,lit=true": { | ||
| "model": "usefulmachinery:block/lava_generator_on", | ||
| "y": 180 | ||
| }, | ||
| "facing=west,lit=false": { | ||
| "model": "usefulmachinery:block/lava_generator", | ||
| "y": 270 | ||
| }, | ||
| "facing=west,lit=true": { | ||
| "model": "usefulmachinery:block/lava_generator_on", | ||
| "y": 270 | ||
| } | ||
| } | ||
| } |
42 changes: 42 additions & 0 deletions
42
src/generated/resources/assets/usefulmachinery/lang/en_us.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,42 @@ | ||
| { | ||
| "block.usefulmachinery.coal_generator": "Coal Generator", | ||
| "block.usefulmachinery.compactor": "Compactor", | ||
| "block.usefulmachinery.creative_power_cell": "Creative Power Cell", | ||
| "block.usefulmachinery.crusher": "Crusher", | ||
| "block.usefulmachinery.electric_smelter": "Electric Smelter", | ||
| "block.usefulmachinery.lava_generator": "Lava Generator", | ||
| "container.usefulmachinery.coal_generator": "Coal Generator", | ||
| "container.usefulmachinery.compactor": "Compactor", | ||
| "container.usefulmachinery.crusher": "Crusher", | ||
| "container.usefulmachinery.electric_smelter": "Electric Smelter", | ||
| "container.usefulmachinery.lava_generator": "Lava Generator", | ||
| "item.usefulmachinery.battery": "Battery", | ||
| "item.usefulmachinery.compactor_kit": "Compactor Kit", | ||
| "item.usefulmachinery.efficiency_upgrade": "Efficiency Upgrade", | ||
| "item.usefulmachinery.machine_frame": "Machine Frame", | ||
| "item.usefulmachinery.precision_upgrade": "Precision Upgrade", | ||
| "item.usefulmachinery.sustained_upgrade": "Sustained Upgrade", | ||
| "item.usefulmachinery.tier_upgrade_basic": "Basic Upgrade", | ||
| "item.usefulmachinery.tier_upgrade_factory": "Factory Upgrade", | ||
| "item.usefulmachinery.tier_upgrade_overkill": "Overkill Upgrade", | ||
| "item.usefulmachinery.tier_upgrade_reinforced": "Reinforced Upgrade", | ||
| "itemGroup.usefulmachinery.base": "Useful Machinery", | ||
| "jei.usefulmachinery.compacting": "Compacting", | ||
| "jei.usefulmachinery.crushing": "Crushing", | ||
| "jei.usefulmachinery.electric_smelting": "Electric Smelting", | ||
| "jei.usefulmachinery.fuel": "Fuel for RF", | ||
| "misc.usefulmachinery.compact_block": "Block Former", | ||
| "misc.usefulmachinery.compact_gear": "Gear Manufacturing", | ||
| "misc.usefulmachinery.compact_plate": "Plate Press", | ||
| "misc.usefulmachinery.empty": "Empty", | ||
| "misc.usefulmachinery.energy": "%s FE", | ||
| "misc.usefulmachinery.energyWithMax": "%s / %s FE", | ||
| "misc.usefulmachinery.fluidWithMax": "%s / %s mB", | ||
| "misc.usefulmachinery.fluidWithMaxName": "%s, %s / %s mB", | ||
| "misc.usefulmachinery.redstoneMode": "Redstone Mode, %s", | ||
| "stat.usefulmachinery.interact_with_coal_generator": "Interactions with Coal Generator", | ||
| "stat.usefulmachinery.interact_with_compactor": "Interactions with Compactor", | ||
| "stat.usefulmachinery.interact_with_crusher": "Interactions with Crusher", | ||
| "stat.usefulmachinery.interact_with_electric_smelter": "Interactions with Electric Smelter", | ||
| "stat.usefulmachinery.interact_with_lava_generator": "Interactions with Lava Generator" | ||
| } |
7 changes: 7 additions & 0 deletions
7
src/generated/resources/assets/usefulmachinery/models/block/coal_generator.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,7 @@ | ||
| { | ||
| "parent": "usefulmachinery:block/machine_block", | ||
| "render_type": "minecraft:cutout", | ||
| "textures": { | ||
| "front": "usefulmachinery:block/coal_generator_front" | ||
| } | ||
| } |
7 changes: 7 additions & 0 deletions
7
src/generated/resources/assets/usefulmachinery/models/block/coal_generator_on.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,7 @@ | ||
| { | ||
| "parent": "usefulmachinery:block/machine_block", | ||
| "render_type": "minecraft:cutout", | ||
| "textures": { | ||
| "front": "usefulmachinery:block/coal_generator_front_on" | ||
| } | ||
| } |
7 changes: 7 additions & 0 deletions
7
src/generated/resources/assets/usefulmachinery/models/block/compactor.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,7 @@ | ||
| { | ||
| "parent": "usefulmachinery:block/machine_block", | ||
| "render_type": "minecraft:cutout", | ||
| "textures": { | ||
| "front": "usefulmachinery:block/compactor_front" | ||
| } | ||
| } |
7 changes: 7 additions & 0 deletions
7
src/generated/resources/assets/usefulmachinery/models/block/compactor_on.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,7 @@ | ||
| { | ||
| "parent": "usefulmachinery:block/machine_block", | ||
| "render_type": "minecraft:cutout", | ||
| "textures": { | ||
| "front": "usefulmachinery:block/compactor_front_on" | ||
| } | ||
| } |
7 changes: 7 additions & 0 deletions
7
src/generated/resources/assets/usefulmachinery/models/block/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 |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| { | ||
| "parent": "usefulmachinery:block/machine_block", | ||
| "render_type": "minecraft:cutout", | ||
| "textures": { | ||
| "front": "usefulmachinery:block/crusher_front" | ||
| } | ||
| } |
7 changes: 7 additions & 0 deletions
7
src/generated/resources/assets/usefulmachinery/models/block/crusher_on.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,7 @@ | ||
| { | ||
| "parent": "usefulmachinery:block/machine_block", | ||
| "render_type": "minecraft:cutout", | ||
| "textures": { | ||
| "front": "usefulmachinery:block/crusher_front_on" | ||
| } | ||
| } |
7 changes: 7 additions & 0 deletions
7
src/generated/resources/assets/usefulmachinery/models/block/electric_smelter.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,7 @@ | ||
| { | ||
| "parent": "usefulmachinery:block/machine_block", | ||
| "render_type": "minecraft:cutout", | ||
| "textures": { | ||
| "front": "usefulmachinery:block/electric_smelter_front" | ||
| } | ||
| } |
7 changes: 7 additions & 0 deletions
7
src/generated/resources/assets/usefulmachinery/models/block/electric_smelter_on.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,7 @@ | ||
| { | ||
| "parent": "usefulmachinery:block/machine_block", | ||
| "render_type": "minecraft:cutout", | ||
| "textures": { | ||
| "front": "usefulmachinery:block/electric_smelter_front_on" | ||
| } | ||
| } |
7 changes: 7 additions & 0 deletions
7
src/generated/resources/assets/usefulmachinery/models/block/lava_generator.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,7 @@ | ||
| { | ||
| "parent": "usefulmachinery:block/machine_block", | ||
| "render_type": "minecraft:cutout", | ||
| "textures": { | ||
| "front": "usefulmachinery:block/lava_generator_front" | ||
| } | ||
| } |
7 changes: 7 additions & 0 deletions
7
src/generated/resources/assets/usefulmachinery/models/block/lava_generator_on.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,7 @@ | ||
| { | ||
| "parent": "usefulmachinery:block/machine_block", | ||
| "render_type": "minecraft:cutout", | ||
| "textures": { | ||
| "front": "usefulmachinery:block/lava_generator_front_on" | ||
| } | ||
| } |
2 changes: 1 addition & 1 deletion
2
...xamplemod/models/block/example_block.json → ...achinery/models/block/redstone_block.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,6 +1,6 @@ | ||
| { | ||
| "parent": "minecraft:block/cube_all", | ||
| "textures": { | ||
| "all": "minecraft:block/cauldron_inner" | ||
| "all": "minecraft:block/redstone_block" | ||
| } | ||
| } |
2 changes: 1 addition & 1 deletion
2
.../examplemod/models/item/example_item.json → .../usefulmachinery/models/item/battery.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,6 +1,6 @@ | ||
| { | ||
| "parent": "minecraft:item/generated", | ||
| "textures": { | ||
| "layer0": "examplemod:item/example_item" | ||
| "layer0": "usefulmachinery:item/battery" | ||
| } | ||
| } |
3 changes: 3 additions & 0 deletions
3
src/generated/resources/assets/usefulmachinery/models/item/coal_generator.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": "usefulmachinery:block/coal_generator" | ||
| } |
3 changes: 3 additions & 0 deletions
3
src/generated/resources/assets/usefulmachinery/models/item/compactor.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": "usefulmachinery:block/compactor" | ||
| } |
7 changes: 7 additions & 0 deletions
7
src/generated/resources/assets/usefulmachinery/models/item/compactor_kit.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,7 @@ | ||
| { | ||
| "parent": "minecraft:item/generated", | ||
| "textures": { | ||
| "layer0": "usefulfoundation:item/lead_plate", | ||
| "layer1": "usefulfoundation:item/gold_gear" | ||
| } | ||
| } |
Oops, something went wrong.