2874 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Gerkiz	86ae1d5c9b	fix lua tooltip warnings	2022-04-07 16:11:57 +02:00
Gerkiz	5a6539b6db	fix gui issue	2022-04-07 16:11:26 +02:00
Gerkiz	98d29e73da	mtn v3 - fixes	2022-04-07 16:11:18 +02:00
Gerkiz	38415cead9	player modifiers - limit rpg inventory	2022-04-07 16:11:03 +02:00
Gerkiz	4ce2342629	rpg - revert inventory bonus	2022-04-07 16:10:40 +02:00
Gerkiz	096cb77cdb	Merge pull request #240 from ComfyFactory/mtn_v3 ... Fix laggy module and make terrain randomized in Mtn v3	2022-04-07 00:19:09 +02:00
Gerkiz	03d681e29c	mtn v3 -make terrain randomized	2022-04-07 00:17:41 +02:00
Gerkiz	73c0c7f2be	remove unused module	2022-04-07 00:16:16 +02:00
Gerkiz	8cb713af67	fix laggy module	2022-04-07 00:10:58 +02:00
Gerkiz	b19daf9b76	Merge pull request #239 from ComfyFactory/aoe_punch ... rename one punch to aoe punch	2022-04-05 20:04:07 +02:00
Gerkiz	29b865fe3b	rename one punch to aoe punch	2022-04-05 20:02:13 +02:00
Gerkiz	061f6a3d15	Merge pull request #238 from ComfyFactory/refactor_gui ... Refactor gui	2022-04-05 19:44:32 +02:00
Gerkiz	82affb25dd	minor fix	2022-04-05 19:41:44 +02:00
Gerkiz	dbe79dcdfd	minor change	2022-04-05 19:39:01 +02:00
Gerkiz	95f2e90e55	refactor more gui	2022-04-05 19:28:08 +02:00
Gerkiz	f74e99f3f4	refactor gui	2022-04-05 19:27:46 +02:00
Gerkiz	a51d361824	tweaks and changes	2022-04-05 12:00:13 +02:00
Gerkiz	26aa773788	Merge pull request #236 from ComfyFactory/gui_fix ... Fix minor gui issue	2022-03-29 22:27:32 +02:00
Gerkiz	fc43ef8618	set default to false	2022-03-29 22:26:09 +02:00
Gerkiz	7cf25ff1c0	Fix minor gui issue	2022-03-29 22:24:58 +02:00
Gerkiz	da10bf40dc	Merge pull request #235 from ComfyFactory/minor_fixes ... minor fix	2022-03-29 21:36:27 +02:00
Gerkiz	60625c9103	Merge branch 'develop' into minor_fixes	2022-03-29 21:35:39 +02:00
Gerkiz	e5611d8a3c	minor fix	2022-03-29 21:35:00 +02:00
Gerkiz	67b953b39d	Merge pull request #234 from ComfyFactory/fixes ... Fix freeplay and fish defender	2022-03-29 20:14:29 +02:00
Gerkiz	b7315b5980	Fix freeplay and various other files	2022-03-29 20:12:50 +02:00
Gerkiz	d096d4ca4e	minor fix	2022-03-17 12:23:16 +01:00
Gerkiz	bc56388028	Merge pull request #230 from Astorin/develop ... RU locale update	2022-03-15 20:12:05 +01:00
Gerkiz	eea9f7e441	Merge branch 'develop' into develop	2022-03-15 20:04:30 +01:00
Gerkiz	507472cb73	Merge pull request #231 from ComfyFactory/fixes ... Minor fixes	2022-03-15 20:02:10 +01:00
Gerkiz	d8066b5ee7	Rework jail permissions	2022-03-15 20:00:00 +01:00
Gerkiz	a2a0e92ad1	Minor change	2022-03-15 19:59:44 +01:00
Gerkiz	840937015b	Fix deep jungle	2022-03-15 19:59:38 +01:00
Shadow_Man	7f6862bd9c	RU locale update	2022-03-12 19:21:32 +02:00
Gerkiz	c55edffc12	Merge pull request #229 from ComfyFactory/changes ... Minor changes and tweaks	2022-03-06 00:41:29 +01:00
Gerkiz	e8deb4ae08	minor fix	2022-03-06 00:35:33 +01:00
Gerkiz	1c205b8580	disable map	2022-03-06 00:35:07 +01:00
Gerkiz	a19b5e8132	enable module in control	2022-03-06 00:34:28 +01:00
Gerkiz	6dcacbcb52	fix groups	2022-03-06 00:34:22 +01:00
Gerkiz	4edfd949d1	fix hunger games	2022-03-06 00:34:05 +01:00
Gerkiz	acba7ebfe1	use _G where we can	2022-03-06 00:33:54 +01:00
Gerkiz	87a5796a08	spam protect - disable warnings	2022-03-06 00:33:35 +01:00
Gerkiz	590b58504c	fix deep_jungle	2022-03-06 00:33:21 +01:00
Gerkiz	980a97d1cb	Merge pull request #228 from ComfyFactory/groups ... fix groups	2022-03-05 18:29:41 +01:00
Gerkiz	5cd6691645	fix groups	2022-03-05 18:28:03 +01:00
Gerkiz	4937172d6e	Merge pull request #227 from ComfyFactory/disable_module ... disable inserter_drops_pickup since it's causing desyncs	2022-03-05 17:51:25 +01:00
Gerkiz	7fc0be44c7	disable inserter_drops_pickup since it's causing desyncs	2022-03-05 17:50:02 +01:00
Gerkiz	2a984b8b1b	Merge pull request #226 from ComfyFactory/scrap_towny ... scrap towny ffa fixes	2022-03-01 19:34:25 +01:00
Gerkiz	1a7d6f1c77	make luacheck happy	2022-03-01 19:33:13 +01:00
Gerkiz	0191cf5e5d	scrap towny ffa fixes	2022-03-01 19:31:57 +01:00
Gerkiz	01dc8160b8	Merge pull request #225 from ComfyFactory/scrap_fixes ... scrap towny ffa fixes	2022-03-01 19:21:14 +01:00