MattTheTekie/GladiatorMine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
1,259 commits 3 branches 0 tags 2 MiB
Commit graph

1,259 commits

This branch
This branch
All branches
Author SHA1 Message Date
PeratX
9e57b31cd4 Merge pull request #857 from iTXTech/block-api 
Refactor block internal API
 2016-04-27 06:25:13 +08:00
Muqsit Rayyan
32fc71ef22 Merge pull request #858 from edwinyoo44/patch-3 
Update zho.ini
 2016-04-25 17:49:50 +03:00
Hsinweic Chen
20195a8cbf Update zho.ini 2016-04-25 22:31:09 +08:00
Tatsuyuki Ishi
a0e663fa12 Refactor block internal API 2016-04-25 23:01:00 +09:00
PeratX
f6cbcfa797 CR again 2016-04-25 21:06:27 +08:00
Tatsuyuki Ishi
fba473c07c Fix CommandReader 
This reverts commit dfcb966380 and changes some things.
 2016-04-25 22:00:38 +09:00
PeratX
dfcb966380 Improved CommandReader 2016-04-25 20:24:31 +08:00
Tatsuyuki Ishi
f0abd95848 Fix CommandReader, fix #852 
Windows sucks. PHP sucks.
 2016-04-25 19:09:51 +09:00
Tatsuyuki Ishi
ca8989608a Revert "Improve command reader" 
This reverts commit 900da36a1f.
 2016-04-24 19:15:37 +09:00
Tatsuyuki Ishi
900da36a1f Improve command reader 2016-04-24 18:57:22 +09:00
Tatsuyuki Ishi
f6b2c442ae Revert "Fixed a bug in CommandReader" 
This reverts commit a692f7cb59.
Hey @PeratX, everything you did is dangerous and will lead to crash.
 2016-04-24 17:35:11 +09:00
PeratX
a692f7cb59 Fixed a bug in CommandReader 2016-04-24 15:51:24 +08:00
PeratX
9cdba6f58a Reformatte 2016-04-24 14:28:21 +08:00
PeratX
9b23b56231 Merge pull request #850 from iTXTech/849-mobspawner 
Mob spawner rewrite
 2016-04-24 14:21:37 +08:00
PeratX
ecaa1ace34 Fixed #779 2016-04-24 14:19:50 +08:00
Tatsuyuki Ishi
f90844fb46 Mob spawner rewrite 
Closes #849
 2016-04-24 14:02:35 +09:00
Tatsuyuki Ishi
211b67e98c Update CI script 
workaround for frequent PHP crashes
 2016-04-24 10:34:25 +09:00
Tatsuyuki Ishi
575487e6f8 Merge pull request #848 from iTXTech/fix-readline 
Reimplement console reader and readline
 2016-04-24 00:00:12 +09:00
Tatsuyuki Ishi
ca9cd75bd8 CI: Use bash 
Dash has poor echo
 2016-04-23 23:45:47 +09:00
Tatsuyuki Ishi
43bfa9692d Reimplement console reader and readline 
Completely resolves all problems.
 2016-04-23 23:36:09 +09:00
Tatsuyuki Ishi
93963e172b Merge pull request #846 from jojoe77777/patch-1 
Fixes Mooshrooms showing as cows
 2016-04-23 18:57:46 +09:00
Tatsuyuki Ishi
9e0b8a85b1 Update .travis.yml 2016-04-23 18:52:04 +09:00
Tatsuyuki Ishi
03d2aa7c65 CI: Fix quote 2016-04-23 18:47:38 +09:00
Tatsuyuki Ishi
cc5dd3f95d Fix CI permission 2016-04-23 18:46:11 +09:00
Tatsuyuki Ishi
c80ac42330 Shell-based CI 2016-04-23 18:45:18 +09:00
Tatsuyuki Ishi
59a25520dd Update .pullapprove.yml 
[ci skip]
 2016-04-23 15:09:26 +09:00
Tatsuyuki Ishi
72c0f7d7c9 Remove Ozelot 
This should be a mistake.
 2016-04-23 15:03:27 +09:00
jojoe77777
e9d1e59e23 Fixes Mushrooms showing as cows 2016-04-23 13:38:20 +10:00
CrayonDing
87aa1e7e58 Merge pull request #844 from iTXTech/GalvinGao-Master-README.md 
Update Logo, Contents, and some grammar
 2016-04-22 21:35:10 -05:00
GalvinGao
b0e09f6e8e Update Logo, Contents, and some gramm 2016-04-23 09:29:20 +08:00
dog194
5d9d3ad586 Merge pull request #843 from iTXTech/dog194-DeadBush 
FIx DeadBush can be placed at any block
 2016-04-22 09:40:35 -05:00
dog194
3b5495bfb2 FIx DeadBush can be placed at any block 
DeadBush can be placed only at SAND PODZOL HARDENED_CLAY and STAINED_CLAY
 2016-04-22 22:32:08 +08:00
PeratX
240c9079f9 Lava populator for nether generator! 2016-04-22 17:42:56 +08:00
PeratX
c1f72821a0 Improved Nether Generator. Some new APIs in SimpleChunkManager 2016-04-21 17:16:29 +08:00
Muqsit Rayyan
a08b2e4787 Merge pull request #834 from iTXTech/dog194-speed 
Slow the growing speed of CocoaBeans and NetherWart.
 2016-04-20 23:36:38 +03:00
Muqsit Rayyan
59584a4538 Merge pull request #836 from iTXTech/dog194-patch-1 
fix #835
 2016-04-20 23:36:30 +03:00
dog194
4d5ccff816 fix #835 2016-04-20 13:53:14 -05:00
dog194
2eea226264 Slow the growing speed of NetherWart. 2016-04-21 01:53:32 +08:00
dog194
0e356ec7b0 Slow the growing speed of CocoaBeans 2016-04-21 01:47:51 +08:00
dog194
8582c3647b Dog194 cocoa beans (#832) 
* ※Now Cocoa Beans can be cropped
Add Cocoa Beans Block and so on....
 2016-04-20 07:14:43 +09:00
PeratX
231c5351c3 Fixed #791 2016-04-19 21:54:12 +08:00
PeratX
41321fbb92 Format 2016-04-19 14:39:48 +08:00
PeratX
b319df70b9 Merge remote-tracking branch 'origin/Dog194-Unbreaking' 
# Conflicts:
#	src/pocketmine/block/Tripwire.php
 2016-04-19 14:38:33 +08:00
dog194
d99134c803 ※New Tools' durability system 
fix some tool type
 2016-04-19 13:10:52 +08:00
dog194
9147026830 ※New Tools' durability system 
1).Axes, pickaxes, and shovels:
Breaking a block that breaks instantly counts as 0 uses.
Breaking other blocks counts as 1 use.
Tilling a grass block using a shovel to make grass path counts as 1 use.
Hitting a mob (hostile, neutral or farm animal) counts as 2 uses.
2).Hoes:
Tilling dirt or grass counts as 1 use.
Hitting a mob counts as 1 use.
Breaking a block counts as 0 uses.
3).Shears:
Shearing a sheep counts as 1 use.
Breaking cobweb, leaves, tall grass, tripwire, wool and vines counts as 1 use.
Breaking other blocks or hitting a mob count as 0 uses.
4).Swords:
Breaking a block that breaks instantly counts as 0 uses.
Breaking other blocks counts as 2 uses.
Hitting a mob counts as 1 use.
5).Flint and steel
Breaking a block or hitting a mob count as 0 uses.
Using it to light a Nether portal counts as 1 use.
Using it to set blocks on fire counts as 1 use.
From minecraft WIKI http://minecraft.gamepedia.com/Item_durability
※Update for Unbreaking
All kind of tools
 2016-04-19 12:31:32 +08:00
PeratX
5e9891968f Merge pull request #829 from iTXTech/Dog194-Hardness 
Dog194 hardness
 2016-04-19 11:21:54 +08:00
Gao Yichuan
23e7a38c04 fix a typo in README 
[ci skip]
 2016-04-18 18:16:38 -05:00
dog194
7a84f0a6b9 ※Update for SILK TOUCH 
Stone
 2016-04-18 23:56:02 +08:00
dog194
7ed1636b4f Some Blocks' Hardness and Blast resistance value fix 2016-04-18 23:42:35 +08:00
PeratX
cf03504474 Added special thanks to JetBrains 2016-04-18 16:03:52 +08:00