summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVarga Szabolcs <starstylestudio1@gmail.com>2021-01-05 03:14:53 +0100
committerGitHub <noreply@github.com>2021-01-05 03:14:53 +0100
commit00c0a23ace8ed0a6db402965d72c786357f72634 (patch)
treeba5e7b357ce546262502fb44b76adfb42c79d33e
parentFix potential destruction crashes (#5095) (diff)
downloadcuberite-00c0a23ace8ed0a6db402965d72c786357f72634.tar
cuberite-00c0a23ace8ed0a6db402965d72c786357f72634.tar.gz
cuberite-00c0a23ace8ed0a6db402965d72c786357f72634.tar.bz2
cuberite-00c0a23ace8ed0a6db402965d72c786357f72634.tar.lz
cuberite-00c0a23ace8ed0a6db402965d72c786357f72634.tar.xz
cuberite-00c0a23ace8ed0a6db402965d72c786357f72634.tar.zst
cuberite-00c0a23ace8ed0a6db402965d72c786357f72634.zip
-rw-r--r--.gitignore1
-rw-r--r--Server/Protocol/1.12.2/base.recipes.txt8
2 files changed, 5 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore
index 32184b02c..0657a6c55 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,6 +14,7 @@ Tools/ProtoProxy/ProtoProxy
Testing/
ChunkWorxSave.ini
doxy/
+.vscode/
Profiling
Symbols
cloc-ignored.txt
diff --git a/Server/Protocol/1.12.2/base.recipes.txt b/Server/Protocol/1.12.2/base.recipes.txt
index e5c52fa8b..c80c88f45 100644
--- a/Server/Protocol/1.12.2/base.recipes.txt
+++ b/Server/Protocol/1.12.2/base.recipes.txt
@@ -50,8 +50,8 @@
58 stone_axe
59 sticky_piston
60 stick
-61 spruce_stairs
-62 spruce_slab
+61 spruce_slab
+62 spruce_stairs
63 spruce_planks
64 spruce_fence_gate
65 spruce_fence
@@ -150,8 +150,8 @@
158 orange_bed
159 orange_banner
160 observer
-161 oak_stairs
-162 oak_slab
+161 oak_slab
+162 oak_stairs
163 oak_planks
164 note_block
165 nether_wart_block