libraryaddict
e7213fdb7e
Remove project specific settings
2015-12-13 16:41:37 +13:00
Shaun Bennett
ac6d3c2c8f
merge with master
2015-12-11 06:27:23 -05:00
libraryaddict
3cd187ff04
Move LineFormat.java
2015-12-11 16:57:21 +13:00
libraryaddict
4cfa7c436b
Add missing file
2015-12-11 16:48:40 +13:00
William Burns
563a0f0ec7
remove tutorial and no flicker
2015-12-11 02:30:44 +00:00
libraryaddict
1661c056c1
Added line stuff
2015-12-11 15:21:05 +13:00
Shaun Bennett
2694787590
Reverting
2015-12-10 20:59:57 -05:00
William Burns
626a812844
Many changes
2015-12-11 00:40:54 +00:00
Cheese
fabf3dab59
updated blocksearch
2015-12-10 13:12:01 +11:00
Cheese
09d8367b4b
fixed method
2015-12-09 07:32:36 +11:00
Christopher Jozsa
0b8e0409b6
Merge pull request #92 in MIN/mineplex from update-SSM to master
...
* commit '504a49278cb7e140029e4c2ceb85f3defe524a33':
SSM kit description change, grammar mistake
SSM Pig bomb bug fix
2015-12-08 14:29:32 -06:00
Teddy
2bf1012fa4
SSM Pig bomb bug fix
2015-12-08 16:34:07 +00:00
Shaun Bennett
a1915e324c
Some java 8 code
2015-12-08 08:42:45 -05:00
Cheese
fe1f763374
changed order blocks will be added to the list
2015-12-08 15:26:32 +11:00
Shaun Bennett
8ff034fb5d
Merge pull request #89 in MIN/mineplex from clans-beta to master
...
* commit 'eed6966a5b39d1fc9544055a5b5801758a62a56a':
Winter MOTD, Stat fixes (maybe?!)
made use ability teleport player back to where they should be
Forgot to push these changes last update!
fixed tnt blowing up in claims when offline
fixed task not getting cleanup up after /skiptutorial
fixed /skiptutorial not working, and fixed tutorial thinking you're still in tutorial after finishing/cancelling/skipping
Fix heavy attribute, disable claim visualizer
Disable subtasks for now
Clans alpha 0.17
clan claim visualizer
fixed infinite claims
2015-12-07 12:22:10 -06:00
Cheese
fa6418769b
YT name change
2015-12-06 21:26:02 +11:00
Cheese
e01d30b920
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-12-04 13:19:07 +11:00
Cheese
ef2511434d
tuber arnk
2015-12-04 13:18:23 +11:00
Christopher Jozsa
8717f962e6
Merge pull request #83 in MIN/mineplex from mrsomeone12_SmallFixes to master
...
* commit 'c98b427fdebb0d8abcce3a17731c0f9b35eece01':
Added missing MountData and SingleEntityMountData files.
Mount bug fix.
Added method to edit NoAI field on entities.
Implemented new mount data system replacing instead of entities as data.
We only need to add the "Go Back" page once...
TitanMount fixes
2015-12-03 17:15:21 -06:00
NewGarbo
584a02ae3e
fixed infinite claims
2015-12-03 10:30:06 +00:00
Christopher Jozsa
fc0cae8e0f
Merge pull request #85 in MIN/mineplex from virizion_utils to master
...
* commit 'bf92af647abceb78596f9fd1922d3522e61ff053':
Fixed the skull bug where it gave you the wrong skull type. Now gets the meta of the block as well. Also can return multiple items if the block is made up of multiple items (flower pots, ender portal frames).
2015-12-02 18:53:30 -06:00
NewGarbo
d6ca52e4a4
modifications
2015-12-02 05:11:09 +00:00
Virizion
bf92af647a
Fixed the skull bug where it gave you the wrong skull type. Now gets the meta of the block as well. Also can return multiple items if the block is made up of multiple items (flower pots, ender portal frames).
2015-12-02 00:00:32 -05:00
NewGarbo
f536bf23e5
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-12-01 12:06:25 +00:00
NewGarbo
d32e6fdb96
Got rid of deployed tasks. using different system now. (untested)
2015-12-01 11:28:14 +00:00
Virizion
666b9963e4
Added an utility method in UtilBlock to get an ItemStack from a block and also handles correcting Material types and Data Values.
2015-11-30 17:42:48 -05:00
xGamingDudex
6120c8246b
Merge remote-tracking branch 'origin/master' into mrsomeone12_SmallFixes
2015-11-29 19:11:24 +01:00
xGamingDudex
2c2370f8a0
Added method to edit NoAI field on entities.
2015-11-29 19:08:26 +01:00
Shaun Bennett
f82396d485
Clans changes/fixes
2015-11-29 02:41:53 -05:00
NewGarbo
aa68701ebd
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-11-28 20:16:49 +00:00
NewGarbo
d8ae035f84
creative scoreboard team. and fixed npe in tutorials
2015-11-28 09:20:42 +00:00
Cheese
963caae719
Merge remote-tracking branch 'remotes/origin/mrsomeone12_SmallFixes'
2015-11-28 16:00:28 +11:00
Cheese
8af545af80
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountTitanData.java
2015-11-28 15:59:26 +11:00
Cheese
0871663498
titan stuff
...
I HATE YOU SNAKE.
2015-11-28 15:57:07 +11:00
Shaun Bennett
1a87d85174
Merge remote-tracking branch 'remotes/origin/master' into clans-beta
2015-11-27 23:13:43 -05:00
xGamingDudex
24f8a98545
Added titan particle trail.
2015-11-28 02:22:41 +01:00
libraryaddict
5f8f643d95
What snake mount code I did
2015-11-28 05:26:43 +13:00
NewGarbo
3be2986cea
sethome command now places bed even if theres grass
2015-11-27 13:26:12 +00:00
Cheese
4e2f48b37e
Merge branch 'master' into clans-beta
...
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilAlg.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/grenades/Smoke.java
2015-11-27 19:16:30 +11:00
Cheese
98d988584d
titan cosmetics
2015-11-27 13:35:25 +11:00
NewGarbo
0aaee24600
fixed gear UI display stuff incorrectly
2015-11-26 21:06:33 +00:00
NewGarbo
56d5c10481
oops util ent new method didn't commit in last commit
2015-11-26 07:29:59 +00:00
Cheese
193c5fe487
fixed static
2015-11-26 15:26:57 +11:00
Cheese
059a9a32cd
fixed method
2015-11-26 14:51:45 +11:00
Cheese
1a5dbc073d
recursive block find method
2015-11-26 14:47:01 +11:00
NewGarbo
11deec75dd
fixed illusion
2015-11-26 00:44:13 +00:00
Shaun Bennett
1306137cb2
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-11-25 14:51:00 -05:00
Shaun Bennett
ff5d828dd7
Merge with master, lots of clans fixes/work
2015-11-25 14:50:49 -05:00
NewGarbo
9a8fba543d
auto-replanting trees
2015-11-25 17:03:48 +00:00
NewGarbo
2adfef41ca
bug fixes and new stuff ( https://docs.google.com/spreadsheets/d/1jrKJIXhIF0TZvYKLyAC50IYfN8ylLZK_M8lSexEZTkc/edit#gid=0&vpid=A10 )
2015-11-25 16:46:53 +00:00
