359 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Esophose	9662211e0c	Fix fire ticks being applied from arrows that had a cancelled event	2019-02-22 21:07:27 -07:00
Esophose	be737d0a6f	Fix '/is level' when stackables are disabled	2019-02-22 20:03:11 -07:00
Esophose	8d02557d6d	Fix stackables loading/saving	2019-02-22 19:48:55 -07:00
Esophose	ce51e02b4c	Change generator order based on ticket SD-1824	2019-02-22 17:41:27 -07:00
Esophose	473d8c908e	Fix bank not accepting decimals, fix ArrayIndexOutOfBoundsException	2019-02-22 02:49:58 -07:00
Esophose	e997bb3770	Bump build to 69	2019-02-22 02:40:26 -07:00
Esophose	6d3289df43	Fix newline at %cancel in message issue for ticket SD-1638	2019-02-22 02:15:08 -07:00
Esophose	3163f5a734	Fix "/is admin level" page 3+ in 1.12-, also remove gaps	2019-02-22 00:54:16 -07:00
Esophose	1912bcd5e8	Island level now takes into account island types unlocked	2019-02-21 21:05:41 -07:00
Esophose	761e94bfd8	Fix island upgrades persisting after leaving island	2019-02-21 19:43:30 -07:00
Brianna O'Keefe	2234462424	Offhand protection stackables.	2019-02-17 22:32:30 -05:00
Brianna O'Keefe	e5dc8eda4e	Merge remote-tracking branch 'origin/master'	2019-02-17 18:41:07 -05:00
Brianna O'Keefe	02972fbff9	fix	2019-02-17 18:41:03 -05:00
Brianna O'Keefe	12abcabcf1	Merge branch 'patch-1' into 'master' ... Biome actually changes See merge request Songoda/SkyBlock!5	2019-02-17 15:01:33 +00:00
Brianna O'Keefe	6e3dae4a3a	1.13 gen perms	2019-02-17 09:24:19 -05:00
Brianna O'Keefe	9a990a7d03	fix for generator perms.	2019-02-17 09:01:03 -05:00
Brianna O'Keefe	1d9c067abf	Fix	2019-02-17 03:19:24 -05:00
Brianna O'Keefe	dce19a136b	Fix	2019-02-17 02:47:58 -05:00
Brianna O'Keefe	d5ec64c577	fixed stackable leveling.	2019-02-17 01:01:58 -05:00
Brianna O'Keefe	c91372ff40	resolved save issue.	2019-02-17 00:23:05 -05:00
Brianna O'Keefe	aa78ee51a6	Merge remote-tracking branch 'origin/master'	2019-02-14 11:53:14 -05:00
Brianna O'Keefe	2ac16a169c	Fixed npe	2019-02-14 11:53:10 -05:00
Brianna O'Keefe	a4b444addf	Update .gitlab-ci.yml	2019-02-13 02:22:16 +00:00
Brianna O'Keefe	7542bb7edc	Merge remote-tracking branch 'origin/master'	2019-02-12 21:19:57 -05:00
Brianna O'Keefe	139b07695e	fix for moving stackables.	2019-02-12 21:19:52 -05:00
Brianna O'Keefe	289c8adbe8	Merge branch 'StoneGenerators' into 'master' ... Fixed stone generators not working See merge request Songoda/SkyBlock!6	2019-02-12 06:37:01 +00:00
TheLimeGlass	be34b18910	Fixed stone generators not working	2019-02-11 23:35:18 -07:00
Adrian M	58738e86dc	Biome actually changes	2019-02-11 19:46:24 +00:00
Brianna O'Keefe	6681df1d6b	Fix for error.	2019-02-10 00:23:24 -05:00
Brianna O'Keefe	307b99c19d	Merge remote-tracking branch 'origin/master'	2019-02-10 00:13:27 -05:00
Brianna O'Keefe	441073b4ff	Worldborder color	2019-02-10 00:12:54 -05:00
Brianna O'Keefe	2e3b9a4045	Update .gitlab-ci.yml	2019-02-08 18:23:27 +00:00
Brianna O'Keefe	14c36f106e	Update .gitlab-ci.yml	2019-02-08 17:52:50 +00:00
Brianna O'Keefe	b9abac5b6a	Update .gitlab-ci.yml	2019-02-08 17:40:18 +00:00
Brianna O'Keefe	bf6f08091a	Version	2019-02-07 17:17:26 -05:00
Brianna O'Keefe	b715907858	ignore.	2019-02-07 17:04:02 -05:00
Brianna O'Keefe	045a3cdfe6	Merge remote-tracking branch 'origin/master'	2019-02-07 17:03:01 -05:00
Brianna O'Keefe	6381e7b138	Added island banks.	2019-02-07 17:02:39 -05:00
Brianna O'Keefe	35e9eb9f76	Update pom.xml	2019-02-03 19:45:37 +00:00
Brianna O'Keefe	ed68439427	Update pom.xml	2019-02-03 19:41:30 +00:00
Brianna O'Keefe	d7efe4bdda	fix	2019-02-03 01:42:18 -05:00
Brianna O'Keefe	e8e38d6d8d	fix	2019-02-02 14:09:23 -05:00
Brianna O'Keefe	c156797c03	fixes	2019-02-02 12:55:09 -05:00
Brianna O'Keefe	094d08218c	Fix for startup error.	2019-02-02 12:10:16 -05:00
Brianna O'Keefe	0003d000ef	pom	2019-02-02 11:56:50 -05:00
Brianna O'Keefe	efd4b9938e	teleportation will now correctly reset fly/upgrades.	2019-02-02 11:39:51 -05:00
Brianna O'Keefe	43a6373ce2	Added reset and restart.	2019-02-02 11:18:47 -05:00
Brianna O'Keefe	24bbaa7d28	Stackables.	2019-02-02 03:04:25 -05:00
Brianna O'Keefe	3fb63da4ba	Added Stackables.	2019-02-02 03:04:14 -05:00
Brianna O'Keefe	c48f67df42	Fixed issues with materials	2019-02-01 15:05:28 -05:00