Mysticate
|
b36bf37197
|
Merge remote-tracking branch 'origin/master' into update-paintball
|
2015-12-15 19:22:38 -05:00 |
Cheese
|
871c97f7af
|
changed chest %'s
|
2015-12-15 09:25:44 +11:00 |
|
Cheese
|
0f38c7b287
|
increased minimum coal
|
2015-12-14 22:12:50 +11:00 |
|
Cheese
|
951cd65903
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-12-14 22:05:22 +11:00 |
|
Cheese
|
045bc760c2
|
increassed cooldown, people getting trapped perm
|
2015-12-14 22:05:08 +11:00 |
|
Cheese
|
809ff649be
|
lowered rarities a bit
|
2015-12-14 22:03:09 +11:00 |
Shaun Bennett
|
7181a26e58
|
Remove pointless equals()
|
2015-12-14 05:56:39 -05:00 |
|
Cheese
|
9e72e5adf1
|
nicer text
|
2015-12-14 21:43:11 +11:00 |
|
Cheese
|
daa9f165b1
|
removed coins from gadgets
|
2015-12-14 21:41:47 +11:00 |
|
Cheese
|
52394c89dd
|
fixed skins beign wrong way around
|
2015-12-14 21:34:27 +11:00 |
|
Cheese
|
0ecd5a05f5
|
fixed hat ownership
reduced coal cost
|
2015-12-14 21:32:06 +11:00 |
|
Cheese
|
00de6880ba
|
fixed wrong types
|
2015-12-14 21:25:30 +11:00 |
|
Cheese
|
342e9f2345
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-12-14 20:53:49 +11:00 |
|
Cheese
|
1189535748
|
icon fixes
|
2015-12-14 20:53:34 +11:00 |
|
Shaun Bennett
|
816c057eb3
|
Notify server about opening chest
|
2015-12-14 04:49:44 -05:00 |
|
Shaun Bennett
|
6ec8ec4c01
|
Merge pull request #97 in MIN/mineplex from william-gladiators to master
* commit 'd91e4ab4f756746b31c7ebdd3e7d33c139ea7d30':
Another door bug, and a title fix.
Health looks nicer.
Bug fixes. Title shortened.
|
2015-12-14 03:45:55 -06:00 |
|
Shaun Bennett
|
daf1d29ce0
|
Fix Carl
|
2015-12-14 04:44:11 -05:00 |
|
Shaun Bennett
|
50bf97ae4a
|
Fancy treasure changes
|
2015-12-14 04:19:15 -05:00 |
|
Cheese
|
670eaa1954
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-12-14 19:16:03 +11:00 |
|
Shaun Bennett
|
e4fd97467f
|
More treasure changes
|
2015-12-14 03:14:52 -05:00 |
|
Cheese
|
288c20fc74
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-12-14 19:13:05 +11:00 |
|
Cheese
|
9e35399d1d
|
rarities tweaked + shards
|
2015-12-14 19:09:55 +11:00 |
|
Shaun Bennett
|
db9db558a0
|
Update GUI slots
|
2015-12-14 02:56:07 -05:00 |
|
Shaun Bennett
|
4afca01ad0
|
Treasures!
|
2015-12-14 02:49:51 -05:00 |
|
Cheese
|
c508b5ea96
|
chest visuals
|
2015-12-14 18:13:19 +11:00 |
|
Shaun Bennett
|
063c87c4fe
|
Merge remote-tracking branch 'origin/master'
|
2015-12-14 00:29:11 -05:00 |
|
Shaun Bennett
|
cdbcae7e3e
|
Cosmetic Menu Update
|
2015-12-14 00:28:28 -05:00 |
|
Cheese
|
048a9a81b8
|
gadget ammo should no logner be purchasable
|
2015-12-14 16:20:39 +11:00 |
|
Cheese
|
7f9e5c4ec9
|
more coal
|
2015-12-14 16:06:49 +11:00 |
|
Cheese
|
f6f04fe256
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-12-14 16:04:05 +11:00 |
|
Cheese
|
55fffdad59
|
fixed some colors
|
2015-12-14 16:03:51 +11:00 |
|
Shaun Bennett
|
e8b0e5dd8e
|
Fix IntellIJ Files
|
2015-12-13 23:51:47 -05:00 |
|
Shaun Bennett
|
8e31c79c58
|
Merge remote-tracking branch 'origin/master'
|
2015-12-13 23:46:46 -05:00 |
|
Cheese
|
bccade55bc
|
reduced coal fumes size
|
2015-12-14 15:43:45 +11:00 |
|
Shaun Bennett
|
5be91de006
|
Merge master
|
2015-12-13 23:40:18 -05:00 |
|
Cheese
|
f26c31b7ec
|
xmas a little harder
|
2015-12-14 15:33:09 +11:00 |
|
Shaun Bennett
|
fe3431ba04
|
Cosmetic Menu Update
|
2015-12-13 23:31:21 -05:00 |
|
Cheese
|
1073981778
|
Merge branch 'master' into update-xmaschaos
|
2015-12-14 15:30:15 +11:00 |
|
Cheese
|
94169a5b8a
|
it made me push it :(
|
2015-12-14 15:29:34 +11:00 |
|
Cheese
|
c34ac3ec52
|
xmas
|
2015-12-14 15:21:43 +11:00 |
Jonathan Williams
|
dcf3c1ea88
|
Deleted and added new Cache since renaming was jacked up.
|
2015-12-13 23:14:17 -05:00 |
|
Mysticate
|
42244ae798
|
Snowman AI fix
|
2015-12-13 22:43:11 -05:00 |
|
Mysticate
|
a04eaddc42
|
Fixed bump
|
2015-12-13 22:25:18 -05:00 |
libraryaddict
|
f90484c37f
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-12-14 15:43:03 +13:00 |
|
libraryaddict
|
b5bdf7ced4
|
Remove custom name on players on join and arcade spectator
|
2015-12-14 15:42:32 +13:00 |
|
Mysticate
|
0dd7db27cd
|
FIXED FORAMTTING
|
2015-12-13 19:49:41 -05:00 |
|
Mysticate
|
a827f95eb4
|
Fixed scoreboard. VIVA LA FIESTA
|
2015-12-13 19:24:24 -05:00 |
|
Mysticate
|
0e9e8c155f
|
Quick fix that I don't think i caused.
|
2015-12-13 19:11:06 -05:00 |
|
Mysticate
|
0c383f8bf4
|
Remove bad message
|
2015-12-13 18:58:03 -05:00 |
|
Mysticate
|
90145bf8e7
|
Merge branch 'master' of
http://Mysticate@184.154.0.242:7990/scm/min/mineplex.git into
update-xmaschaos
Conflicts:
Plugins/Mineplex.Core/.settings/org.eclipse.jdt.core.prefs
Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerGameMenu.java
|
2015-12-13 18:57:35 -05:00 |