3113 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Gerkiz	2880571e6a	minor change	2022-04-08 00:08:40 +02:00
Gerkiz	8177457a5b	fix	2022-04-08 00:04:29 +02:00
Gerkiz	059eafcb11	Merge pull request #243 from ComfyFactory/ws ... template fix	2022-04-07 23:29:03 +02:00
Gerkiz	d274165af5	template fix	2022-04-07 23:27:31 +02:00
Gerkiz	abd7323af8	Merge pull request #242 from ComfyFactory/webhook ... test webhook event	2022-04-07 22:02:43 +02:00
Gerkiz	a5a0dafb2c	test webhook event	2022-04-07 22:00:46 +02:00
Gerkiz	5c0723d8a5	Merge pull request #241 from ComfyFactory/changes ... Changes	2022-04-07 16:19:02 +02:00
Gerkiz	5bbd704438	Added new function to iterate over all connected players	2022-04-07 16:12:47 +02:00
Gerkiz	c048002b7d	gui label fixes	2022-04-07 16:12:34 +02:00
Gerkiz	095895ed81	perlin - made it faster when using in loop	2022-04-07 16:12:25 +02:00
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
danielmartin0	ae02f762df	typo v1.1.1.5.4	2022-03-31 13:11:30 +01:00
danielmartin0	e37507c7ab	v1.1.5.3	2022-03-31 13:11:15 +01:00
Eric Anderson	75864b385c	revert change to control.lua	2022-03-29 22:53:22 -07:00
Eric Anderson	9abbd226da	Fix issues found by luacheck	2022-03-29 22:44:51 -07:00
Eric Anderson	79e9bdee7e	Merge https://github.com/eric-anderson/ComfyFactorio into master	2022-03-29 22:15:56 -07:00
Eric Anderson	72eaf30140	Rebalance item loot so treasure rooms are also limited on available loot	2022-03-29 22:11:30 -07:00
danielmartin0	ad87b0c14b	.luacheckrc gitignored	2022-03-30 01:04:04 +01:00
danielmartin0	87b725a16e	Merge remote-tracking branch 'upstream/develop' into develop	2022-03-30 01:00:38 +01:00
danielmartin0	9b44587aa1	Delete MacOS.gitignore	2022-03-30 00:59:34 +01:00
danielmartin0	0dd1904b3b	Merge branch 'develop' of https://github.com/danielmartin0/ComfyFactorio-Pirates into develop	2022-03-30 00:58:03 +01:00
danielmartin0	2376863df6	no changes; cache refresh	2022-03-30 00:58:02 +01: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	7f7aa3a470	Merge branch 'develop' into develop	2022-03-29 21:55:34 +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
danielmartin0	0ff31e14cf	tiny patch	2022-03-29 13:09:06 +01:00
Eric Anderson	b724de5fbb	bugfix: change to have more resources accidentally applied to corridors	2022-03-28 22:02:22 -07:00
Eric Anderson	e44d0ef3f6	tweak resources in treasure biome down by 2x it was too high	2022-03-28 22:00:13 -07:00