3651 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Gerkiz	53a611f5dd	Merge pull request #309 from ComfyFactory/towny ... Towny small changes	2022-09-22 20:44:08 +02:00
Gerkiz	e9b7789f5a	Towny small changes	2022-09-22 20:42:46 +02:00
Gerkiz	8e79d3c800	Towny small fix	2022-09-22 20:25:08 +02:00
Gerkiz	d03e49c538	Merge pull request #308 from ComfyFactory/towny-changes ... Merges towny changes from blubFisch	2022-09-22 20:22:33 +02:00
Gerkiz	6b5edd5a4b	Add towny to panel	2022-09-22 20:20:12 +02:00
Gerkiz	3d856551b4	Towny - merge upstream changes ... Changes done by blubFisch	2022-09-22 20:20:05 +02:00
Gerkiz	a89aa3e5c0	Merge pull request #307 from Agocelt/MF_fixes ... Mf fixes	2022-09-21 16:39:55 +02:00
Johny	0cc4b2a05a	Stats GUI fix	2022-09-18 11:35:24 +02:00
Johny	10b1fb18de	Locale changes	2022-09-18 11:32:16 +02:00
Johny	eb2aabb731	Stats GUI shows coins spent on train upgrades	2022-09-18 11:10:58 +02:00
Johny	8e7c92df45	Fixing aura market limit and chest icon	2022-09-18 10:31:10 +02:00
Gerkiz	7367f78817	Merge pull request #306 from ComfyFactory/modulefix ... Fix weird gui on launch fish to win module	2022-09-15 00:03:00 +02:00
Gerkiz	6379675a75	Fix weird gui on launch fish to win module	2022-09-15 00:01:51 +02:00
Gerkiz	0aec08449a	Merge pull request #305 from danielmartin0/develop ... Pirate Ship v1.3.5	2022-09-13 23:21:37 +02:00
danielmartin0	89ecd34edf	Update .gitignore	2022-09-13 22:19:44 +01:00
danielmartin0	3880a5a446	luacheck	2022-09-13 22:10:53 +01:00
danielmartin0	b3fb6040a3	luacheck	2022-09-13 22:09:25 +01:00
danielmartin0	bbc71d6a3e	Update .gitignore	2022-09-13 22:06:13 +01:00
danielmartin0	d10c9206c2	Merge branch 'develop' into develop	2022-09-13 22:03:59 +01:00
danielmartin0	6c61dac590	Update pirates.cfg	2022-09-13 22:03:07 +01:00
Gerkiz	c788309d63	Wave defense - minor fix	2022-09-07 21:37:15 +02:00
Gerkiz	84d3fb1719	Jail data - minor fix	2022-09-03 21:44:27 +02:00
Gerkiz	a47a50ade0	Merge pull request #304 from ComfyFactory/improv ... Fixes and tweaks	2022-09-03 21:28:54 +02:00
Gerkiz	7b7967cabc	Merge branch 'develop' into improv	2022-09-03 21:28:03 +02:00
Gerkiz	b4c5b42548	Misc - various nil checks	2022-09-03 21:26:20 +02:00
Gerkiz	e69a2c4c6c	Wave defense - add locale	2022-09-03 21:26:08 +02:00
Gerkiz	1369566160	Wave defense - pause without votes	2022-09-03 21:25:56 +02:00
Gerkiz	3ada59a9be	Jaildata - send jail to named channel	2022-09-03 21:25:30 +02:00
Gerkiz	8a4aa9220f	Add new jail channel to discord	2022-09-03 21:25:10 +02:00
Gerkiz	02f6a315c8	Merge pull request #303 from Agocelt/MF_locomotive_health_purchase ... Purchasing train health heals it by the amount increased	2022-08-29 20:05:40 +02:00
Gerkiz	68fb9fae65	Merge branch 'develop' into MF_locomotive_health_purchase	2022-08-29 19:44:32 +02:00
Johny	0f5ef9927a	Adding check for overheal	2022-08-29 18:18:07 +02:00
Johny	b7481c49ab	Purchasing train health heals it by the amount increased	2022-08-29 17:14:33 +02:00
Gerkiz	5f699f3f07	RPG - fix a weird migration issue	2022-08-29 16:35:24 +02:00
Gerkiz	d3da946ebf	Merge pull request #302 from ComfyFactory/githubworker ... add expanse to github worker	2022-08-28 22:55:08 +02:00
Gerkiz	0e6a3c464e	add expanse to github worker	2022-08-28 22:54:05 +02:00
Gerkiz	4733010dc9	Jail - revert test	2022-08-28 18:02:40 +02:00
Gerkiz	99e9734363	Merge pull request #301 from ComfyFactory/session_handler ... Session handler - fix minor issue	2022-08-18 21:14:24 +02:00
Gerkiz	64b63f691a	Session handler - fix minor issue	2022-08-18 21:09:13 +02:00
hanakocz	18c0ce7d01	Merge pull request #299 from ComfyFactory/expanse_update ... Expanse update - locale, early uranium access, fixes	2022-08-18 21:01:43 +02:00
Gerkiz	412fb767ec	Merge branch 'develop' into expanse_update	2022-08-18 20:55:47 +02:00
Gerkiz	1aa4329701	Session handler - fix broken table key	2022-08-18 20:55:29 +02:00
Gerkiz	c5018a5840	Merge branch 'develop' into expanse_update	2022-08-18 19:57:38 +02:00
Gerkiz	b6b2f4a840	Merge pull request #300 from ComfyFactory/mtn_v3_fix ... Mtn v3 - fix bad boo boo	2022-08-18 19:57:32 +02:00
Gerkiz	b1dd8f9835	Mtn v3 - fix bad boo boo	2022-08-18 19:55:43 +02:00
hanakocz	48142adea7	value blacklist adjust	2022-08-18 19:17:06 +02:00
hanakocz	64e037af97	Expanse update - locale, early uranium access, fixes	2022-08-18 19:04:34 +02:00
Gerkiz	734bf54a51	Merge pull request #298 from ComfyFactory/utils_fix ... Fix jail and session handler	2022-08-16 19:45:21 +02:00
Gerkiz	de6a2937e0	Fix luacheck	2022-08-16 19:33:41 +02:00
Gerkiz	5492de059b	Fix jail and session handler	2022-08-16 19:31:45 +02:00