Skip to content
This repository has been archived by the owner on Jan 19, 2024. It is now read-only.

Commit

Permalink
Merge pull request #41 from KhanhPham05/1.18-update
Browse files Browse the repository at this point in the history 
0.2.0
  • Loading branch information
@KhanhPham05
KhanhPham05 authored Aug 26, 2022
2 parents 34fb088 + d053358 commit 46d6b09
Show file tree
Hide file tree
Showing 135 changed files with 833 additions and 1,007 deletions.
Binary file modified .gradle/7.3/checksums/checksums.lock
View file
Binary file not shown.
Binary file modified .gradle/7.3/checksums/sha1-checksums.bin
View file
Binary file not shown.
Binary file modified .gradle/7.3/executionHistory/executionHistory.bin
View file
Binary file not shown.
Binary file modified .gradle/7.3/executionHistory/executionHistory.lock
View file
Binary file not shown.
Binary file modified .gradle/7.3/fileHashes/fileHashes.bin
View file
Binary file not shown.
Binary file modified .gradle/7.3/fileHashes/fileHashes.lock
View file
Binary file not shown.
Binary file modified .gradle/7.3/fileHashes/resourceHashesCache.bin
View file
Binary file not shown.
Binary file modified .gradle/buildOutputCleanup/buildOutputCleanup.lock
View file
Binary file not shown.
Binary file modified build/tmp/compileJava/previous-compilation-data.bin
View file
Binary file not shown.
143 changes: 50 additions & 93 deletions src/generated/resources/.cache/cache
View file

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions src/generated/resources/assets/tothemoon/lang/en_us.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,7 @@
"jei.tothemoon.alloy_smelter_category": "Alloy Smelting",
"jei.tothemoon.high_heat_smelting": "High Heat Smelting",
"jei.tothemoon.metal_press_category": "Metal Pressing",
"jei.tothemoon.ore_processing": "Ore Processing",
"jei.tothemoon.recipe_consume_mold": "Consume Mold",
"jei.tothemoon.workbench_crafting": "Workbench Crafting",
"message.tothemoon.nbf_form_fail": "Can not form Nether Brick Furnace",
Expand Down
6 changes: 3 additions & 3 deletions src/generated/resources/data/forge/tags/blocks/sheetmetals.json
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"replace": false,
"values": [
"#forge:sheetmetals/steel",
"#forge:sheetmetals/gold",
"#forge:sheetmetals/iron",
"#forge:sheetmetals/copper",
"#forge:sheetmetals/gold"
"#forge:sheetmetals/steel",
"#forge:sheetmetals/copper"
]
}
8 changes: 4 additions & 4 deletions src/generated/resources/data/forge/tags/items/dusts.json
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"replace": false,
"values": [
"#forge:dusts/redstone_steel_metal",
"#forge:dusts/redstone_metal",
"#forge:dusts/uranium",
"#forge:dusts/steel",
"#forge:dusts/gold",
"#forge:dusts/coal",
"#forge:dusts/iron",
"#forge:dusts/copper",
"#forge:dusts/redstone_metal",
"#forge:dusts/iron",
"#forge:dusts/gold",
"#forge:dusts/redstone_steel_metal",
"#forge:dusts/heated_coal"
]
}
6 changes: 3 additions & 3 deletions src/generated/resources/data/forge/tags/items/gears.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
"values": [
"#forge:gears/copper",
"#forge:gears/iron",
"#forge:gears/redstone_metal",
"#forge:gears/gold",
"#forge:gears/steel",
"#forge:gears/redstone_steel",
"#forge:gears/steel"
"#forge:gears/gold",
"#forge:gears/redstone_metal"
]
}
6 changes: 6 additions & 0 deletions src/generated/resources/data/forge/tags/items/ores/uranium.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"tothemoon:deepslate_uranium_ore"
]
}
8 changes: 4 additions & 4 deletions src/generated/resources/data/forge/tags/items/rods.json
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"replace": false,
"values": [
"#forge:rods/gold",
"#forge:rods/steel",
"#forge:rods/redstone_metal",
"#forge:rods/copper",
"#forge:rods/iron",
"#forge:rods/redstone_steel",
"#forge:rods/uranium",
"#forge:rods/gold"
"#forge:rods/redstone_steel",
"#forge:rods/redstone_metal",
"#forge:rods/copper"
]
}
4 changes: 2 additions & 2 deletions src/generated/resources/data/forge/tags/items/sheetmetals.json
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"replace": false,
"values": [
"#forge:sheetmetals/steel",
"#forge:sheetmetals/copper",
"#forge:sheetmetals/gold",
"#forge:sheetmetals/iron"
"#forge:sheetmetals/iron",
"#forge:sheetmetals/steel"
]
}
8 changes: 4 additions & 4 deletions src/generated/resources/data/forge/tags/items/storage_blocks.json
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"replace": false,
"values": [
"#forge:storage_blocks/steel",
"#forge:storage_blocks/redstone_steel",
"#forge:storage_blocks/purified_quartz",
"#forge:storage_blocks/uranium",
"#forge:storage_blocks/raw_uranium",
"#forge:storage_blocks/steel",
"#forge:storage_blocks/redstone_metal",
"#forge:storage_blocks/uranium"
"#forge:storage_blocks/redstone_steel",
"#forge:storage_blocks/purified_quartz"
]
}
4 changes: 4 additions & 0 deletions src/generated/resources/data/tothemoon/advancements/alloying/redstone_metal.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"criteria": {},
"requirements": []
}
4 changes: 4 additions & 0 deletions src/generated/resources/data/tothemoon/advancements/alloying/steel_ingot.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"criteria": {},
"requirements": []
}
13 changes: 13 additions & 0 deletions src/generated/resources/data/tothemoon/advancements/ore_processing/coal_dust.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"criteria": {
"auto_trigger": {
"trigger": "minecraft:tick",
"conditions": {}
}
},
"requirements": [
[
"auto_trigger"
]
]
}
13 changes: 13 additions & 0 deletions src/generated/resources/data/tothemoon/advancements/ore_processing/copper_from_ore.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"criteria": {
"auto_trigger": {
"trigger": "minecraft:tick",
"conditions": {}
}
},
"requirements": [
[
"auto_trigger"
]
]
}
13 changes: 13 additions & 0 deletions src/generated/resources/data/tothemoon/advancements/ore_processing/copper_from_raw.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"criteria": {
"auto_trigger": {
"trigger": "minecraft:tick",
"conditions": {}
}
},
"requirements": [
[
"auto_trigger"
]
]
}
13 changes: 13 additions & 0 deletions src/generated/resources/data/tothemoon/advancements/ore_processing/gold_from_ore.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"criteria": {
"auto_trigger": {
"trigger": "minecraft:tick",
"conditions": {}
}
},
"requirements": [
[
"auto_trigger"
]
]
}
13 changes: 13 additions & 0 deletions src/generated/resources/data/tothemoon/advancements/ore_processing/gold_from_raw.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"criteria": {
"auto_trigger": {
"trigger": "minecraft:tick",
"conditions": {}
}
},
"requirements": [
[
"auto_trigger"
]
]
}
13 changes: 13 additions & 0 deletions src/generated/resources/data/tothemoon/advancements/ore_processing/iron_from_ore.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"criteria": {
"auto_trigger": {
"trigger": "minecraft:tick",
"conditions": {}
}
},
"requirements": [
[
"auto_trigger"
]
]
}
13 changes: 13 additions & 0 deletions src/generated/resources/data/tothemoon/advancements/ore_processing/iron_from_raw.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"criteria": {
"auto_trigger": {
"trigger": "minecraft:tick",
"conditions": {}
}
},
"requirements": [
[
"auto_trigger"
]
]
}
13 changes: 13 additions & 0 deletions src/generated/resources/data/tothemoon/advancements/ore_processing/lapis_lazuli.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"criteria": {
"auto_trigger": {
"trigger": "minecraft:tick",
"conditions": {}
}
},
"requirements": [
[
"auto_trigger"
]
]
}
13 changes: 13 additions & 0 deletions src/generated/resources/data/tothemoon/advancements/ore_processing/netherite_scrap.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"criteria": {
"auto_trigger": {
"trigger": "minecraft:tick",
"conditions": {}
}
},
"requirements": [
[
"auto_trigger"
]
]
}
13 changes: 13 additions & 0 deletions src/generated/resources/data/tothemoon/advancements/ore_processing/quartz.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"criteria": {
"auto_trigger": {
"trigger": "minecraft:tick",
"conditions": {}
}
},
"requirements": [
[
"auto_trigger"
]
]
}
13 changes: 13 additions & 0 deletions src/generated/resources/data/tothemoon/advancements/ore_processing/redstone.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"criteria": {
"auto_trigger": {
"trigger": "minecraft:tick",
"conditions": {}
}
},
"requirements": [
[
"auto_trigger"
]
]
}
4 changes: 2 additions & 2 deletions ...s/recipes/misc/blasting/copper_ingot.json → ...recipes/misc/blasting/gold_from_dust.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"tothemoon:blasting/copper_ingot"
"tothemoon:blasting/gold_from_dust"
]
},
"criteria": {
Expand All @@ -13,7 +13,7 @@
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "tothemoon:blasting/copper_ingot"
"recipe": "tothemoon:blasting/gold_from_dust"
}
}
},
Expand Down
4 changes: 2 additions & 2 deletions ...nts/recipes/misc/blasting/gold_ingot.json → ...recipes/misc/blasting/iron_from_dust.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"tothemoon:blasting/gold_ingot"
"tothemoon:blasting/iron_from_dust"
]
},
"criteria": {
Expand All @@ -13,7 +13,7 @@
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "tothemoon:blasting/gold_ingot"
"recipe": "tothemoon:blasting/iron_from_dust"
}
}
},
Expand Down
26 changes: 0 additions & 26 deletions src/generated/resources/data/tothemoon/advancements/recipes/misc/smelting/copper_ingot.json
View file

This file was deleted.

4 changes: 2 additions & 2 deletions ...nts/recipes/misc/blasting/iron_ingot.json → ...recipes/misc/smelting/gold_from_dust.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"tothemoon:blasting/iron_ingot"
"tothemoon:smelting/gold_from_dust"
]
},
"criteria": {
Expand All @@ -13,7 +13,7 @@
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "tothemoon:blasting/iron_ingot"
"recipe": "tothemoon:smelting/gold_from_dust"
}
}
},
Expand Down
26 changes: 0 additions & 26 deletions src/generated/resources/data/tothemoon/advancements/recipes/misc/smelting/gold_ingot.json
View file

This file was deleted.

Loading

0 comments on commit 46d6b09

Please sign in to comment.