-
-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #29 from German-Immersive-Railroading-Community/1.…
…13.2-fix fix ressources
- Loading branch information
Showing
10 changed files
with
97 additions
and
8 deletions.
There are no files selected for viewing
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,5 +1,8 @@ | ||
# Changelog | ||
|
||
## [Fix] 1.13.2 - 03.09.2022 - 1 | ||
|
||
* Fixed wrong ressources | ||
|
||
## [Update] 01.31.2022 - 1 | ||
|
||
|
11 changes: 10 additions & 1 deletion
11
src/main/resources/assets/gircredstone/blockstates/acceptor.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 +1,10 @@ | ||
{"variants": {"power=false": {"model": "gircredstone:acceptor_off"}, "power=true": {"model": "gircredstone:acceptor_on"}}} | ||
{ | ||
"variants": { | ||
"power=false": { | ||
"model": "gircredstone:block/acceptor_off" | ||
}, | ||
"power=true": { | ||
"model": "gircredstone:block/acceptor_on" | ||
} | ||
} | ||
} |
8 changes: 7 additions & 1 deletion
8
src/main/resources/assets/gircredstone/blockstates/emitter.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 +1,7 @@ | ||
{"variants": {"normal": {"model": "gircredstone:emitter"}}} | ||
{ | ||
"variants": { | ||
"": { | ||
"model": "gircredstone:block/emitter" | ||
} | ||
} | ||
} |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
28 changes: 28 additions & 0 deletions
28
src/main/resources/data/gircredstone/recipes/acceptor.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,28 @@ | ||
{ | ||
"type": "crafting_shaped", | ||
"pattern": [ | ||
"IiI", | ||
"XYX", | ||
"IZI" | ||
], | ||
"key": { | ||
"I": { | ||
"item": "minecraft:redstone_block" | ||
}, | ||
"i": { | ||
"item": "minecraft:redstone_torch" | ||
}, | ||
"X": { | ||
"item": "minecraft:white_concrete" | ||
}, | ||
"Y": { | ||
"item": "minecraft:obsidian" | ||
}, | ||
"Z": { | ||
"item": "minecraft:diamond" | ||
} | ||
}, | ||
"result": { | ||
"item": "gircredstone:acceptor" | ||
} | ||
} |
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,28 @@ | ||
{ | ||
"type": "crafting_shaped", | ||
"pattern": [ | ||
"IiI", | ||
"XYX", | ||
"IZI" | ||
], | ||
"key": { | ||
"I": { | ||
"item": "minecraft:redstone_block" | ||
}, | ||
"i": { | ||
"item": "minecraft:redstone" | ||
}, | ||
"X": { | ||
"item": "minecraft:white_concrete" | ||
}, | ||
"Y": { | ||
"item": "minecraft:obsidian" | ||
}, | ||
"Z": { | ||
"item": "minecraft:diamond" | ||
} | ||
}, | ||
"result": { | ||
"item": "gircredstone:emitter" | ||
} | ||
} |
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,19 @@ | ||
{ | ||
"type": "minecraft:crafting_shaped", | ||
"pattern": [ | ||
" ", | ||
" I ", | ||
" i " | ||
], | ||
"key": { | ||
"I": { | ||
"item": "minecraft:quartz" | ||
}, | ||
"i": { | ||
"item": "minecraft:redstone_torch" | ||
} | ||
}, | ||
"result": { | ||
"item": "gircredstone:linker" | ||
} | ||
} |
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,7 +1,6 @@ | ||
{ | ||
"pack": { | ||
"description": "examplemod resources", | ||
"pack_format": 3, | ||
"_comment": "A pack_format of 3 should be used starting with Minecraft 1.11. All resources, including language files, should be lowercase (eg: en_us.lang). A pack_format of 2 will load your mod resources with LegacyV2Adapter, which requires language files to have uppercase letters (eg: en_US.lang)." | ||
} | ||
"pack_format": 4 | ||
} | ||
} |