ryansnewell
/
mcserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,992 Commits
1 Branch
0 Tags
70 MiB
Commit Graph

6992 Commits (8c3cd18cdd175ea1ca06916e557fdf42d6232d71)

Author SHA1 Message Date
Masy98 8c3cd18cdd Added 1.8 food to the food list 2014-09-11 15:57:36 +02:00
Masy98 5f2e850b0f Added blocks to the fire simulator 2014-09-11 15:48:26 +02:00
Masy98 e34767b265 Fixed incorrect handlers 2014-09-11 15:39:37 +02:00
Masy98 214cc0f15d Added stone slab in BlockSlab.h 2014-09-10 21:50:46 +02:00
Masy98 c0e86e7360 Fixed typo 2014-09-10 21:47:15 +02:00
Masy98 a9b4b60c80 Added new blocks to the BlockInfo 2014-09-10 21:44:04 +02:00
Masy98 f173cfe430 Added new blocks to the BlockHandler 2014-09-10 21:15:06 +02:00
Masy98 074dcbf950 Added iron trapdoor, fence gates and doors to the redstone simulator 2014-09-10 21:07:37 +02:00
Masy98 c967633d0a Added 1.8 Blocks and Items 2014-09-10 21:02:15 +02:00
Tycho c8b41e9b2b Merge branch 'master' of https://github.com/mc-server/MCServer 2014-09-10 19:50:31 +01:00
Tycho cf69ddcce1 Cleaned up flags 2014-09-10 19:49:52 +01: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
Alexander Harkness 32002694b0 Grammar fixes. 2014-09-10 18:47:59 +01:00
Tycho 4f67ca4c0a Added MCServer_ prfix to env vars for versions 2014-09-10 18:08:50 +01:00
Alexander Harkness 35a42fc437 Merge pull request #1413 from mc-server/versionInfo 
Added abilty to set build info
 2014-09-10 17:50:18 +01:00
Tycho c043f68024 Added example for how to use version info to travis 2014-09-10 16:31:23 +01:00
Tycho 27be179939 Added abilty to set build info 
build info is displayed at startup
Fixes #1410
 2014-09-10 16:07:00 +01:00
Mattes D 76d5aa1d51 Merge pull request #1402 from Masy98/Sounds 
Moved sound-configs into BlockID.h and fixed/ added loads of sounds
 2014-09-10 08:36:33 +02:00
Masy98 65e6b1e50e Removed old sound-configuration for SignPosts 2014-09-09 20:10:37 +02:00
Masy98 a171a6ce93 Removed old sound-configuration for Repeaters 2014-09-09 19:50:35 +02:00
Masy98 27edb7f0d0 Removed old sound-configuration for Trapdoors 2014-09-09 19:37:07 +02:00
Masy98 6cc4ac0bca Removed old sound-configuration for doors 2014-09-09 16:28:08 +02:00
Masy98 acae3c9c65 Moved sound-configs into BlockID.h and fixed/ added loads of sounds 2014-09-09 16:00:26 +02:00
Mattes D feb408424c Merge pull request #1399 from mc-server/warnings 
Warnings
 2014-09-09 14:32:58 +02:00
Alexander Harkness 13016c6163 Update Zip2008_PDBs.list 2014-09-09 13:27:26 +01:00
Alexander Harkness 130b2b8991 Update Zip2008.list 2014-09-09 13:27:02 +01:00
worktycho 1f0b6eeaf3 Actually set default 2014-09-09 12:18:20 +01:00
worktycho bd810b80a6 use the correct ASSERT 2014-09-08 21:31:47 +01:00
Tycho fb20c2eb85 FIxed a couple more warnings 2014-09-08 19:15:29 +01:00
Tycho 2c945c8818 TimeOfDay does not need to be an Int64 2014-09-08 19:07:45 +01:00
Tycho 4bdf9256f2 Fixed a few compile warnings 2014-09-08 18:56:27 +01:00
worktycho 64071aeda9 capitalisation error 2014-09-08 17:45:23 +01:00
Mattes D 9e36bbd069 Merge pull request #1397 from mc-server/saveSetting 
If server fails init, save any changed or generated settings.
 2014-09-08 16:31:44 +02:00
worktycho 4613fabd45 derp 2014-09-08 15:15:31 +01:00
worktycho 5f207c8bb7 If server fails init, save any changed or generated settings. 2014-09-08 14:57:58 +01:00
Mattes D c5cd75fae8 Exported cClientHandle:GetIPString() to Lua API. 2014-09-07 22:35:22 +02:00
Mattes D d2c1518145 Webadmin: Added default ports to auto-generated ini file. 
Fixes #1382.
 2014-09-07 19:45:15 +02:00
Mattes D a0feff2734 WebAdmin: Added HTTPS instructions when cert / key is missing. 2014-09-07 19:42:35 +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
Mattes D c71a37012c Merge pull request #1385 from mc-server/clangWarnings 
Should now compile in clang 3.0
 2014-09-06 20:35:51 +02:00
worktycho 22b4511640 Update SetFlags.cmake 2014-09-06 18:11:42 +01:00
Mattes D 52dd5ba6dd Added missing newline. 2014-09-06 19:02:16 +02:00
Mattes D e1a9a6291b Removed chunk's unused Y coord. 
This fixes the second issue of #1313.
 2014-09-06 19:01:30 +02:00
Mattes D 0a651b9fd8 Added Y-wise asserts to signs. 
This should help detect #1313's second case.
 2014-09-06 18:59:17 +02:00
Mattes D 868723ce50 Alpha-sorted protocol 1.7 senders. 2014-09-06 18:57:57 +02:00