summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2016-07-12 22:49:58 +0200
committerGitHub <noreply@github.com>2016-07-12 22:49:58 +0200
commit69ef7f71587765520369a94008602eb3b1d04e5f (patch)
tree83894f6236342e5a0d77b23728fcd46856ae4d57
parentMerge pull request #3259 from cuberite/FixJsonBool (diff)
parentChanged Hopper to wtHopper and adjusted .gitignore. (diff)
downloadcuberite-69ef7f71587765520369a94008602eb3b1d04e5f.tar
cuberite-69ef7f71587765520369a94008602eb3b1d04e5f.tar.gz
cuberite-69ef7f71587765520369a94008602eb3b1d04e5f.tar.bz2
cuberite-69ef7f71587765520369a94008602eb3b1d04e5f.tar.lz
cuberite-69ef7f71587765520369a94008602eb3b1d04e5f.tar.xz
cuberite-69ef7f71587765520369a94008602eb3b1d04e5f.tar.zst
cuberite-69ef7f71587765520369a94008602eb3b1d04e5f.zip
-rw-r--r--.gitignore3
-rw-r--r--Server/Plugins/APIDump/APIDesc.lua2
2 files changed, 3 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index caceee4a8..eb63f620e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -88,7 +88,8 @@ src/AllFiles.lst
*.opensdf
*.sdf
*.sln
-*.opendb
+*.VC.opendb
+*.VC.db
*.idb
# cmake output folders and files
diff --git a/Server/Plugins/APIDump/APIDesc.lua b/Server/Plugins/APIDump/APIDesc.lua
index fd8ef34d0..a09d4b37d 100644
--- a/Server/Plugins/APIDump/APIDesc.lua
+++ b/Server/Plugins/APIDump/APIDesc.lua
@@ -1640,7 +1640,7 @@ end
-- Set window contents:
-- a_Player is a cPlayer object received from the outside of this code fragment
-local Window = cLuaWindow(cWindow.Hopper, 3, 3, "TestWnd");
+local Window = cLuaWindow(cWindow.wtHopper, 3, 3, "TestWnd");
Window:SetSlot(a_Player, 0, cItem(E_ITEM_DIAMOND, 64));
Window:SetOnClosing(OnClosing);
Window:SetOnSlotChanged(OnSlotChanged);