Commit graph

1,302 commits

Author SHA1 Message Date
PeratX
682fc76361 Merge pull request #798 from iTXTech/dog194-getEnchantmentLevel
add getEnchantmentLevel
2016-04-14 07:02:37 +08:00
dog194
fa5eee2a36 Update Cobweb.php 2016-04-14 02:02:11 +08:00
dog194
1e22a99f44 Update DiamondOre.php 2016-04-14 02:01:19 +08:00
dog194
dac76beef7 Update EmeraldOre.php 2016-04-14 01:59:47 +08:00
dog194
0795a6df6f Update RedstoneOre.php 2016-04-14 01:56:10 +08:00
dog194
ed8f962752 Update LapisOre.php 2016-04-14 01:55:30 +08:00
dog194
106d287183 Update CoalOre.php 2016-04-14 01:54:33 +08:00
dog194
26a212ecc3 Update Podzol.php 2016-04-14 01:53:54 +08:00
dog194
ec04100bef Update Mycelium.php 2016-04-14 01:50:06 +08:00
dog194
d627786f67 Update Grass.php 2016-04-14 01:48:55 +08:00
dog194
f047c7173c Update DeadBush.php 2016-04-14 01:02:30 +08:00
dog194
483c9999a6 add getEnchantmentLevel
/**
	 * @param $id
	 * @return Enchantmentlevel|0(for null)
	 */
2016-04-13 23:46:39 +08:00
PeratX
72eb0a6e3f CI fix 2016-04-13 17:56:07 +08:00
PeratX
3e2ca6b01f Merge remote-tracking branch 'origin/master' 2016-04-13 17:46:51 +08:00
PeratX
708f919d17 Added "nogz" option to makeserver and makeplugin command 2016-04-13 17:41:11 +08:00
PeratX
39552795d2 Merge pull request #794 from iTXTech/dog194-patch-FlintSteel-bugfix
Fixbug for FlintSteel
2016-04-13 17:35:45 +08:00
PeratX
3d588f679c Merge pull request #795 from iTXTech/dog194-new-netherportal-tp
New netherportal teleport
2016-04-13 17:35:01 +08:00
dog194
2ae893379a Update Player.php 2016-04-13 12:58:17 +08:00
dog194
feec06950e Update FlintSteel.php 2016-04-13 12:52:26 +08:00
PeratX
21cd738546 Merge remote-tracking branch 'origin/master' 2016-04-13 06:37:45 +08:00
PeratX
b5952e9756 Improved populator 2016-04-13 06:31:11 +08:00
PeratX
19b19010d3 Fixed #792 2016-04-13 06:30:54 +08:00
Tatsuyuki Ishi
876b858470 Merge pull request #790 from iTXTech/dog194-patch-Craft-fix
Fix some Crafting
2016-04-12 22:36:16 +09:00
Tatsuyuki Ishi
a0a67da108 Update .pullapprove.yml
Add dog194
[ci skip]
2016-04-12 22:22:15 +09:00
dog194
f3e68abd7d Update CraftingManager.php 2016-04-12 20:59:03 +08:00
PeratX
24fc2d6f3f Revert "Revert "Added CustomBlockData to skulls""
WARNING: DO NOT REVERT THIS COMMIT AGAKN
This reverts commit 33173ecd33.
2016-04-12 19:34:14 +08:00
Tatsuyuki Ishi
33173ecd33 Revert "Added CustomBlockData to skulls"
This reverts commit 72ad627203.
2016-04-12 20:11:28 +09:00
PeratX
c4e72c92b2 Merge remote-tracking branch 'origin/master' 2016-04-12 14:58:12 +08:00
PeratX
d6d57ba4de Fixed #789. Fixed #788 2016-04-12 14:57:20 +08:00
Tatsuyuki Ishi
b7ce419728 Update .pullapprove.yml 2016-04-12 07:14:14 +09:00
PeratX
fd35f51f98 Reformatted skull 2016-04-11 21:33:34 +08:00
PeratX
a868e96f98 Merge pull request #778 from jojoe77777/patch-1
Added CustomBlockData to skulls
2016-04-11 21:31:28 +08:00
PeratX
a83224009f Added map consts 2016-04-11 20:57:14 +08:00
PeratX
76ee2ef8ff Added some consts 2016-04-11 20:43:56 +08:00
PeratX
e8cead7b27 Improved Weather Command 2016-04-11 18:04:07 +08:00
PeratX
8c62fd96d4 Improved weather 2016-04-11 17:58:27 +08:00
PeratX
67a7486213 New food system from official repo is coming 2016-04-11 17:04:47 +08:00
PeratX
e29ce18e24 Merge remote-tracking branch 'origin/master' 2016-04-11 16:16:46 +08:00
PeratX
2dce429fff Do not add DestroyBlockParticle when spectator. Close #785. 2016-04-11 16:15:55 +08:00
Tatsuyuki Ishi
176bc48954 Update pull approve regex
[ci skip]
2016-04-11 06:21:51 +00:00
PeratX
bbf73443b6 Merge pull request #781 from iTXTech/dog194-patch-1
Update Podzol.php
2016-04-11 10:46:42 +08:00
PeratX
7e7f2b5ec4 Merge pull request #783 from seetch/patch-1
Update rus.ini
2016-04-11 06:51:35 +08:00
Michael N
95c1274ef0 Update rus.ini 2016-04-10 22:19:04 +04:00
Gao Yichuan
9989a08514 Update .pullapprove.yml 2016-04-10 09:38:01 -05:00
Gao Yichuan
1e99f41487 Update .pullapprove.yml 2016-04-10 09:33:16 -05:00
dog194
a08153ccb6 Update Podzol.php 2016-04-10 21:57:05 +08:00
Gao Yichuan
6991fa9c08 Update .pullapprove.yml 2016-04-10 08:51:12 -05:00
Tatsuyuki Ishi
33b8c3040d Merge pull request #780 from iTXTech/dog194-patch-Drops-fix
Drops fix
2016-04-10 22:46:57 +09:00
dog194
c71a8c16db Update DeadBush.php 2016-04-10 21:41:35 +08:00
Tatsuyuki Ishi
6a0cdd2b90 Update .pullapprove.yml
[ci skip]
2016-04-10 22:24:19 +09:00