flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
7,220 Commits 1 Branch 0 Tags 92 MiB
04ee8c43dd
Commit Graph

955 Commits

Author SHA1 Message Date
Tiger Wang
a817243e3f Updated Core 2014-09-26 21:42:55 +01:00
Masy98
2feee3b316 Merge branch 'master' into blocks 
Conflicts:
	src/Items/ItemHandler.cpp
	src/Simulator/IncrementalRedstoneSimulator.cpp
 2014-09-26 18:32:31 +02:00
Howaner
4b38e077cf Merge branch 'master' into EntityCustomName 
Conflicts:
	src/ClientHandle.cpp
	src/ClientHandle.h
	src/Protocol/Protocol.h
	src/Protocol/Protocol125.cpp
	src/Protocol/Protocol125.h
	src/Protocol/Protocol17x.cpp
	src/Protocol/Protocol17x.h
	src/Protocol/ProtocolRecognizer.cpp
	src/Protocol/ProtocolRecognizer.h
	src/World.cpp
	src/World.h
 2014-09-23 14:39:49 +02:00
Alexander Harkness
5f823fd18d Merge pull request #1398 from mc-server/1.8-Protocol 
1.8 Protocol Update
 2014-09-22 20:45:22 +01:00
madmaxoft
b2573aad50 Fixed typos in items.ini. 2014-09-19 22:30:32 +02:00
Mattes D
a5386070d6 Merge pull request #1442 from Masy98/Language 
Added german language support
 2014-09-19 22:28:45 +02:00
Howaner
0baca1f1d8 Updated SPAWNING_ENTITY hook description. 2014-09-19 14:36:02 +02:00
Masy98
b3de0e104f Added german language support, now really 2014-09-18 17:39:32 +02:00
Masy98
400ce1f9e0 Added german language support 2014-09-18 16:37:34 +02:00
Howaner
ccaec8f424 Fixed wrong url in the debuggers plugin 2014-09-17 20:28:30 +02:00
Mattes D
5b63a7fe98 Merge pull request #1353 from mc-server/Effects 
Added speed entity effect.
 2014-09-13 17:05:59 +02:00
madmaxoft
c0a069b260 APIDump: Improved command binding documentation. 2014-09-12 20:59:47 +02:00
Howaner
1223a24d3c Merge branch 'master' into Effects 2014-09-12 19:13:46 +02:00
Masy98
ad1c61c3dd Added slime block to slime balls recipe 2014-09-12 18:07:51 +02:00
Mattes D
84cb258ec2 Merge pull request #1414 from Masy98/Crafting 
Fixed sign recipe
 2014-09-10 20:38:22 +02:00
Masy98
67d710429f Fixed spacing 2014-09-10 20:36:51 +02:00
Masy98
d8c381d8cc Fixed sign recipe 2014-09-10 20:31:33 +02:00
Mattes D
c5cd75fae8 Exported cClientHandle:GetIPString() to Lua API. 2014-09-07 22:35:22 +02:00
Mattes D
690867c89e Fixed submodules' downgrade from the previous PR merge. 2014-09-07 09:09:10 +02:00
Masy98
a2452ff6fa Re-ordered the items.ini and added a few new names 2014-09-06 22:37:48 +02:00
Masy98
9cdb9b6262 Merge branch 'master' into blocks 
Conflicts:
	MCServer/crafting.txt
 2014-09-06 22:06:40 +02:00
Masy98
029eb3d4fa Merge remote-tracking branch 'upstream/master' 2014-09-06 22:03:35 +02:00
Alexander Harkness
f6e029253f Removed outdated message sending methods. 
Fixes #1381
 2014-09-06 10:24:33 +01:00
Mattes D
b1cc1451d4 Merge pull request #1361 from mc-server/WebAdmin 
Webadmin improvements
 2014-09-06 11:12:18 +02:00
Masy98
15bee41a36 Merge remote-tracking branch 'upstream/master' 2014-09-05 11:27:21 +02:00
madmaxoft
1b9edb0279 Debuggers: Reviewed and fixed the Pickups and Poof commands. 
Now they're confirmed working.
 2014-09-03 23:05:49 +02:00
madmaxoft
5fa1a7fa22 Debuggers: Added a test code for ForEachEntityInBox(). 
Currently untested, may not run, may crash.
 2014-09-03 17:02:16 +02:00
madmaxoft
a9ed5baba3 Exported ForEachEntityInBox() to Lua API. 2014-09-03 17:01:23 +02:00
Masy98
4823cbf73d Fixed typo! 2014-09-02 21:54:47 +02:00
Masy98
63e9c9c6d9 Added missing recipes! 2014-09-02 21:36:59 +02:00
Masy98
20678ec542 Seperated the "custom" names from the normal list! 2014-09-02 21:36:32 +02:00
Masy98
96f5b3c465 Added new recipes! 2014-09-02 21:09:32 +02:00
Masy98
cdec89d924 Seperated "custom" names list from the normal list in items.ini! 2014-09-02 21:00:26 +02:00
Howaner
c19b2befa8 Changed the IsEnchantable() comment again. 2014-09-02 20:17:31 +02:00
Howaner
e431bb4e63 Merge branch 'master' into Inventory 2014-09-02 20:11:38 +02:00
Howaner
38e824dbcf Renamed SetWalkSpeed() to SetRelativeWalkSpeed() 2014-09-02 20:10:41 +02:00
Howaner
d3b8100a7b Merge branch 'master' into Effects 2014-09-02 20:03:42 +02:00
Howaner
b8769e3fb4 Merge branch 'master' into WebAdmin 2014-09-02 19:37:03 +02:00
Howaner
42dcd534df Merge branch 'master' into EntityCustomName 2014-09-02 19:36:14 +02:00
Howaner
079634d18c Added the new functions to APIDump. 2014-09-02 19:20:59 +02:00
Howaner
c8953d165c Added a custom name test to the debuggers plugin. 2014-09-02 19:13:36 +02:00
madmaxoft
4837d41368 Re-added alternate spellings of darkgraywool. 2014-09-02 08:35:58 +02:00
madmaxoft
7fb9cbcfb2 Re-updated the Core. 2014-09-02 08:34:23 +02:00
Masy98
8f58cc50dd Added missing leather recipe! 2014-09-01 21:34:04 +02:00
Masy98
cc9acd13b9 Merge branch 'master' into blocks 
Conflicts:
	MCServer/furnace.txt
	MCServer/items.ini
 2014-09-01 21:30:45 +02:00
Masy98
9674224e32 Fixed spacing and light gray wool name! 2014-09-01 19:08:29 +02:00
Mattes D
78b7d0006a Merge pull request #1363 from mc-server/FurnaceRecipes 
Rewritten furnace.txt loading
 2014-09-01 09:00:51 +02:00
Howaner
959f89f5bc Fixed ReplaceString() documentation. 2014-09-01 00:42:40 +02:00
Howaner
3d7b8d3598 Rewrited furnace.txt 2014-08-31 19:28:36 +02:00
Masy98
90d39fd917 Added furnace recipes! 2014-08-31 16:50:05 +02:00