2602 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Gerkiz	6b7316874d	Merge branch 'develop' into Inventory-fullness-flying-text	2021-10-23 00:07:42 +02:00
Gerkiz	8a92a5f671	Merge pull request #140 from ComfyFactory/minor_tweaks ... Minor changes to some files	2021-10-23 00:06:24 +02:00
Gerkiz	670665ec0b	mtn v3 - don't heal players to full health when respawning	2021-10-23 00:05:03 +02:00
Gerkiz	36bc63b220	make gui mod_gui ready	2021-10-23 00:04:48 +02:00
Gerkiz	cb5248cabd	add scheduler (acts like task)	2021-10-23 00:04:33 +02:00
Gerkiz	a97ce5f60b	update fjei to latest	2021-10-23 00:04:17 +02:00
Gerkiz	11e3fd773a	update fjei to latest	2021-10-23 00:04:01 +02:00
Agocelt	14090acbb6	Turning fullness warning into flying text	2021-10-19 16:56:44 +02:00
Gerkiz	ef8d24ddda	Merge pull request #138 from ComfyFactory/mtn_v3 ... mtn v3 - fix weird bug	2021-10-15 23:48:59 +02:00
Gerkiz	0fbe1f0b7d	mtn v3 - fix weird bug	2021-10-15 23:45:10 +02:00
Gerkiz	a477918fc4	Merge pull request #137 from ComfyFactory/minor_fix ... mtn v3 - minor adjustments as per request	2021-10-15 17:28:48 +02:00
Gerkiz	1e61fe2459	mtn v3 - minor text change	2021-10-15 17:27:10 +02:00
Gerkiz	449b4bc7db	mtn v3 - minor adjustments as per request	2021-10-15 17:19:42 +02:00
Gerkiz	a1d48f08fb	Merge pull request #136 from ComfyFactory/minor_fix ... mtn v3 - minor fix	2021-10-15 17:13:59 +02:00
Gerkiz	be6a5cd575	mtn v3 - minor fix	2021-10-15 17:12:37 +02:00
Gerkiz	eadf6e2791	Merge pull request #135 from ComfyFactory/mtn_v3 ... mtn v3 - features and changes	2021-10-15 17:03:13 +02:00
Gerkiz	b550f3f1ee	mtn v3 - features and changes	2021-10-15 16:59:25 +02:00
Gerkiz	af26bae0d0	Merge pull request #134 from ComfyFactory/fish_v2 ... minor changes to fish defender v2	2021-10-14 12:55:05 +02:00
Gerkiz	a703183829	minor changes to fish defender v2	2021-10-14 12:53:43 +02:00
Gerkiz	8db3081b60	Merge pull request #133 from ComfyFactory/changes ... Minor changes to Fish Defender v2 and Mtn v3	2021-10-14 12:42:46 +02:00
Gerkiz	3074109c16	mtn v3 - add some loot to scrapyard	2021-10-14 12:41:28 +02:00
Gerkiz	4fbf4ae2e9	fish defender v2 - add more information to discord	2021-10-14 12:41:13 +02:00
Gerkiz	8970f67fe2	Merge pull request #132 from Agocelt/fix-mine-speed-2 ... Fix mine speed 2	2021-10-14 12:28:08 +02:00
Agocelt	07876a0fc7	Update table.lua	2021-10-11 21:53:58 +02:00
Agocelt	f1df85a95c	Update functions.lua	2021-10-11 21:53:27 +02:00
Gerkiz	aef46f2d0e	Merge pull request #131 from ComfyFactory/mining_speed_tweaks ... mtn v3 - more mining speed tweaks	2021-10-11 10:11:08 +02:00
Gerkiz	6ec1814c47	make luacheck happy	2021-10-11 10:10:16 +02:00
Gerkiz	304dcf5675	mtn v3 - more mining speed tweaks	2021-10-11 10:08:28 +02:00
Gerkiz	dde8533af1	Merge pull request #130 from ComfyFactory/fix_ms ... mtn v3 - fix mine speed	2021-10-11 00:06:38 +02:00
Gerkiz	24e9a2e263	mtn v3 - fix mine speed	2021-10-11 00:05:42 +02:00
Gerkiz	29d0699c53	Merge pull request #129 from ComfyFactory/weird_format ... mtn v3 - fix weird format	2021-10-10 22:41:03 +02:00
Gerkiz	a907852d45	mtn v3 - fix weird format	2021-10-10 22:39:39 +02:00
Gerkiz	0a0721400b	Merge pull request #128 from ComfyFactory/mtn_v3 ... Mtn v3 - tweaks	2021-10-10 22:37:44 +02:00
Gerkiz	6c7c5ccb2d	mtn v3 - remove unused vars	2021-10-10 22:34:11 +02:00
Gerkiz	abf6cbf881	mtn v3 - adjust mining_speed <= 10 players	2021-10-10 22:34:03 +02:00
Gerkiz	b1395a37aa	mtn v3 - tweak mining speed whenever there is <= 5 players	2021-10-10 22:28:11 +02:00
Gerkiz	8bd671cb60	mtn v3 - make functions use local vars	2021-10-10 22:27:53 +02:00
Gerkiz	0cc07345a8	mtn v3 - allow admins to switch permission groups	2021-10-10 22:27:39 +02:00
Gerkiz	1055260845	Merge pull request #126 from ComfyFactory/mtn_v3 ... Mtn v3 - fix that admins can't decon	2021-10-09 17:04:46 +02:00
Gerkiz	8d85482e7a	mtn v3 - fix that admins can't decon	2021-10-09 17:03:09 +02:00
Gerkiz	16ad72fb05	Merge pull request #125 from ComfyFactory/supporters ... Add supporter information to the playerlist	2021-10-09 13:48:33 +02:00
Gerkiz	99b381c0c9	Merge branch 'develop' into supporters	2021-10-09 13:47:45 +02:00
Gerkiz	f3cbba181e	Add supporter information to the playerlist	2021-10-09 13:45:19 +02:00
Gerkiz	2a6c91829c	Merge pull request #124 from Agocelt/Mining-bonus-and-collapse-speed-up ... Mining bonus and collapse speed up	2021-10-08 19:52:07 +02:00
Agocelt	66631aa9a8	Update table.lua	2021-10-08 18:52:14 +02:00
Agocelt	e1dd53cf67	Update functions.lua	2021-10-08 18:50:55 +02:00
hanakocz	1b0a36df29	Merge pull request #123 from ComfyFactory/spooky_forest_fixes ... fixes to spooky_forest map, outdated modules	2021-10-06 22:00:32 +02:00
hanakocz	b368a4ee17	Merge branch 'develop' into spooky_forest_fixes	2021-10-06 21:59:31 +02:00
Gerkiz	40b6fe9f83	Merge pull request #122 from Agocelt/Locale-fixes-and-adjustments ... Locale adjustments	2021-10-06 21:58:46 +02:00
hanakocz	3e334dce4f	fixes to spooky_forest map, outdated modules	2021-10-06 21:56:54 +02:00