Skip to content

Commit

Permalink
Merge pull request #29 from German-Immersive-Railroading-Community/1.…
Browse files Browse the repository at this point in the history
…13.2-fix

fix ressources
  • Loading branch information
MrTroble authored Mar 9, 2022
2 parents bacda6e + a9e756c commit efa4dd0
Show file tree
Hide file tree
Showing 10 changed files with 97 additions and 8 deletions.
3 changes: 3 additions & 0 deletions changelog.md
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

Expand Down
11 changes: 10 additions & 1 deletion src/main/resources/assets/gircredstone/blockstates/acceptor.json
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"
}
}
}
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.

This file was deleted.

1 change: 0 additions & 1 deletion src/main/resources/assets/gircredstone/recipes/linker.json

This file was deleted.

28 changes: 28 additions & 0 deletions src/main/resources/data/gircredstone/recipes/acceptor.json
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"
}
}
28 changes: 28 additions & 0 deletions src/main/resources/data/gircredstone/recipes/emitter.json
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"
}
}
19 changes: 19 additions & 0 deletions src/main/resources/data/gircredstone/recipes/linker.json
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"
}
}
5 changes: 2 additions & 3 deletions src/main/resources/pack.mcmeta
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
}
}

0 comments on commit efa4dd0

Please sign in to comment.