flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
7,323 Commits 1 Branch 0 Tags
3baacce51e05ea4cc6d7352475b08a35ba8bc2a0
Commit Graph
67 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Masy98 3591edd47e Fixed sorting 2014-10-01 19:26:36 +02:00
Masy98 d37b047ebe Merge branch 'master' into blocks 2014-10-01 19:23:43 +02:00
Masy98 0d2a041a69 Fixed Red Sandstone and Prismarine drops 2014-10-01 19:13:59 +02:00
Masy98 1d875d0bc8 Added Daylight Sensors to the "can't push" list 2014-10-01 18:08:31 +02:00
Masy98 0f0763303e Fixed ":" 2014-10-01 18:00:51 +02:00
Masy98 cc9e598803 Added missing 1.8 blocks, E_METAs and sounds 2014-10-01 17:57:53 +02:00
Masy98 79110b29db Combined conditions 2014-09-27 21:49:03 +02:00
Masy98 fc22ba0ce8 Added barriers correctly 2014-09-27 21:07:52 +02: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
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
Masy98 2feee3b316 Merge branch 'master' into blocks 
Conflicts:
	src/Items/ItemHandler.cpp
	src/Simulator/IncrementalRedstoneSimulator.cpp
 2014-09-26 18:32:31 +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
Masy98 0b16bbfc01 Added me to the contributors list 2014-09-14 17:58:09 +02:00
Masy98 ad1c61c3dd Added slime block to slime balls recipe 2014-09-12 18:07:51 +02:00
Masy98 5cf114da39 Added Sea Lantern drops 2014-09-12 17:01:03 +02:00
Masy98 7f42ba9fc1 Fixed 1.8 Item stacking and block harvesting 2014-09-12 16:48:37 +02:00
Masy98 d4641576c0 Added new doors in ItemDoor.h 2014-09-11 16:33:52 +02:00
Masy98 a01994389d Fixed mutton name in Sheep.cpp 2014-09-11 16:24:16 +02:00
Masy98 b185e7f4e6 Fixed mutton name in ItemHandler 2014-09-11 16:11:03 +02:00
Masy98 741791ecfc Added barrier block 2014-09-11 16:07:54 +02:00
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
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
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
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
Masy98 15bee41a36 Merge remote-tracking branch 'upstream/master' 2014-09-05 11:27:21 +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
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
Masy98 90d39fd917 Added furnace recipes! 2014-08-31 16:50:05 +02:00
Masy98 ec259eeef0 Added missing mossy stonebrick recipe! 2014-08-31 16:33:19 +02:00
Masy98 b13f10aabf Added 1.8 recipes! 2014-08-31 16:25:12 +02:00
Masy98 9ee5229833 Added 1.8 blocks and items! 2014-08-31 15:28:01 +02:00
Masy98 55907376d5 Fixed missing slab name in line 297 2014-08-30 21:36:20 +02:00
Masy98 2d5a38bd61 Merge branch 'master' into crafting 2014-08-30 21:31:51 +02:00
Masy98 f71c76cf05 Fixed slab name 2014-08-21 22:13:12 +02:00
Masy98 940304bc64 Added missing recipes for stairs and slabs! 2014-08-21 22:08:34 +02:00
Masy98 b4cc3a118b Added missing recipes for stairs and slabs! 2014-08-21 21:50:32 +02:00
Masy98 81492f70d1 Changed new logs from wood to log! 2014-08-21 21:41:43 +02:00
Masy98 f569826a95 Added missing blocks in item.ini 2014-08-21 21:38:50 +02:00
Masy98 b579451731 Removed Stairs and carpet from the "isSolid" list to prevent mobs falling through them. 2014-07-15 20:34:49 +02:00
Masy98 d272e46821 Removed Stairs and carpet from the "isSolid" list to prevent mobs falling through them. 2014-07-15 20:32:49 +02:00
Masy98 7f4029f8f4 Added Brick fence to m_Transparent 2014-07-15 14:06:03 +02:00
Masy98 2d245264b1 Added various missing blocks in the lists in BlockInfo.cpp 2014-07-15 13:34:45 +02:00