AstralTransRocketries/minosoft-meta
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft-meta.git synced 2025-09-10 05:07:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix rebase

Browse Source
This commit is contained in:
Moritz Zwerger 2023-10-06 13:20:49 +02:00
parent aa544a78fc
commit 5f5014313a
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
1 changed files with 0 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
_/items.json
View File

@ -413,12 +413,6 @@
"chest": { "chest": {
"id": 54 "id": 54
}, },
<<<<<<< HEAD
"redstone_wire": {
"id": 55
},
=======
>>>>>>> 7194ff2 (fix some item ids)
"diamond_ore": { "diamond_ore": {
"id": 56 "id": 56
}, },
@ -428,27 +422,12 @@
"crafting_table": { "crafting_table": {
"id": 58 "id": 58
}, },
<<<<<<< HEAD
"wheat": {
"id": 59
},
=======
>>>>>>> 7194ff2 (fix some item ids)
"farmland": { "farmland": {
"id": 60 "id": 60
}, },
"furnace": { "furnace": {
"id": 61 "id": 61
}, },
<<<<<<< HEAD
"sign": {
"id": 63
},
"oak_door": {
"id": 64
},
=======
>>>>>>> 7194ff2 (fix some item ids)
"ladder": { "ladder": {
"id": 65 "id": 65
}, },
@ -464,12 +443,6 @@
"stone_pressure_plate": { "stone_pressure_plate": {
"id": 70 "id": 70
}, },
<<<<<<< HEAD
"iron_door": {
"id": 71
},
=======
>>>>>>> 7194ff2 (fix some item ids)
"oak_pressure_plate": { "oak_pressure_plate": {
"id": 72 "id": 72
}, },
@ -497,12 +470,6 @@
"clay": { "clay": {
"id": 82 "id": 82
}, },
<<<<<<< HEAD
"sugar_cane": {
"id": 83
},
=======
>>>>>>> 7194ff2 (fix some item ids)
"jukebox": { "jukebox": {
"id": 84 "id": 84
}, },