1
0
Commit Graph

3326 Commits

Author SHA1 Message Date
Howaner
347402d20d Merge branch 'master' into Ranks 2014-09-29 14:37:01 +02:00
Julian Laubstein
f014d8764b Update BlockTorch.h 2014-09-29 13:17:24 +02:00
Julian Laubstein
0b438b5fe8 Added torches placeable on upside-down-halfslaps 2014-09-29 13:12:50 +02:00
Mattes D
666aa1df94 Merge pull request #1473 from mc-server/NewStoneGeneration
Added Granite, Diorite and Andesite to the NaturalPatches generator.
2014-09-29 09:33:13 +02:00
Mattes D
a245213d81 Merge pull request #1478 from doublej472/master
Make endermen take damage in water
2014-09-29 08:08:14 +02:00
Jonathan Frederick
c02711633d Derp 2014-09-28 19:27:53 -07:00
Jonathan Frederick
7a61e1e604 Fix comments 2014-09-28 19:24:47 -07:00
madmaxoft
280831df26 Plugin messages: Vanilla prefixes its payloads with VarInt lengths. 2014-09-28 23:03:44 +02:00
Jonathan Frederick
126b14aa09 Make endermen take damage in water 2014-09-28 13:56:41 -07:00
madmaxoft
488c6159df Revert "1.8: Fixed plugin messages."
This reverts commit 04ee8c43dd.
2014-09-28 22:27:23 +02:00
madmaxoft
f8c627141a Protocol 1.8: Fixed possible crash on malformed packet. 2014-09-28 22:25:48 +02:00
madmaxoft
5a44be13b7 Fixed trailing whitespace. 2014-09-28 22:17:29 +02:00
STRWarrior
7c18681e09 Fixed compilation 2014-09-28 22:10:03 +02:00
Mattes D
1422176d13 Merge pull request #1471 from mc-server/redstoneData
Use factory method to construct redstone simulator data
2014-09-28 22:05:05 +02:00
Mattes D
8d55cd409e Merge pull request #1466 from mc-server/endofsupport
Removed protocols 1.2 to 1.6
2014-09-28 22:04:30 +02:00
STRWarrior
76e0c592ef Added Granite, Diorite and Andesite to the NaturalPatches generator. 2014-09-28 19:27:08 +02:00
Howaner
4391b3fc09 Fixed SetDefaultRank() return value. 2014-09-28 19:08:33 +02:00
worktycho
80fe8d7789 Update Chunk.cpp 2014-09-28 17:57:01 +01:00
Tycho
f6979642e6 Use factory method to construct redstone simulator data 2014-09-28 15:36:00 +01:00
Howaner
63c53a8e23 cRankManager: Added ClearPlayerRanks() 2014-09-28 15:16:11 +02:00
Tiger Wang
ae36ba5d33 Compilation fix 2014-09-28 13:08:00 +01:00
Howaner
27331da017 Updated api documentation. 2014-09-28 11:17:36 +02:00
Howaner
2fb3eb3532 cRankManager: Added GetAllPlayers() and GetPlayerName() 2014-09-28 02:17:32 +02:00
Howaner
04ee8c43dd 1.8: Fixed plugin messages. 2014-09-27 23:22:26 +02:00
Tiger Wang
1f8ee70d55 Bug fix 2014-09-27 22:13:37 +01:00
madmaxoft
03791b1e63 Fixed another redstone crash. 2014-09-27 22:25:07 +02:00
Mattes D
a3b140cb44 Merge pull request #1465 from Masy98/blocks
Added barriers correctly
2014-09-27 22:01:55 +02:00
madmaxoft
113b54aefd BioGen: TwoLevel is now fully settable in INI. 2014-09-27 22:01:47 +02:00
Masy98
79110b29db Combined conditions 2014-09-27 21:49:03 +02:00
madmaxoft
e7de548c89 Fixed minor style issues. 2014-09-27 21:37:36 +02:00
madmaxoft
d1a72eb6de Wrapped clang-specific pragma into an #ifdef block.
MSVC was complaining about an unknown pragma.
2014-09-27 21:33:50 +02:00
Masy98
fc22ba0ce8 Added barriers correctly 2014-09-27 21:07:52 +02:00
Tiger Wang
7b7225e50b Merge remote-tracking branch 'origin/master' into endofsupport 2014-09-27 19:20:02 +01:00
worktycho
cc73b70211 Update IncrementalRedstoneSimulator.inc 2014-09-27 15:24:01 +01:00
worktycho
88a07bd184 Update IncrementalRedstoneSimulator.inc 2014-09-27 15:19:32 +01:00
worktycho
20101fab99 Correct method name. 2014-09-27 15:04:08 +01:00
worktycho
94a0d04d58 Set chunk data 2014-09-27 14:49:03 +01:00
worktycho
4f8818748e Add data accessor. 2014-09-27 14:46:50 +01:00
Tiger Wang
72c087cfd3 Dropped support for <1.7.x 2014-09-27 14:28:14 +01:00
Masy98
6dd47e783a Added default value to switch and spruce gate to fence gate handler 2014-09-27 15:11:35 +02:00
Masy98
485bac2818 Fixed convertToPickups for fence gates 2014-09-27 14:23:58 +02:00
Masy98
30f9a4d3ab Fixed convertToPickups for doors 2014-09-27 14:19:45 +02:00
Mattes D
305778f22f Merge pull request #1456 from Howaner/Fixes
Fixed player custom names in 1.8 and added type checking to map loading
2014-09-26 23:01:22 +02:00
madmaxoft
0d83477540 Fixed UNUSED macro so that it doesn't require type knowledge.
Introduced new UNUSED_VAR macro that is used when type knowledge is available (for local variables).
2014-09-26 22:53:39 +02:00
Mattes D
2c5b0f2378 Merge pull request #1415 from Masy98/blocks
Added 1.8 Blocks and Items
2014-09-26 22:24:45 +02:00
Howaner
af997a09ca Merge branch 'master' into Fixes 2014-09-26 22:23:36 +02:00
Tiger Wang
4e2b838a69 Merge pull request #1455 from mc-server/includes
Removed a few unnecessary includes
2014-09-26 19:46:43 +01:00
worktycho
02db79d725 Update Plugin.h 2014-09-26 19:00:26 +01:00
Masy98
9106a8c29b Moved curly brace to seperate line 2014-09-26 19:45:03 +02:00
Masy98
4105be0bec Re-added 1.8 blocks to the redstone simulator 2014-09-26 19:44:06 +02:00