362 Commits

Author	SHA1	Message	Date
Gerkiz	b08b54642f	Auto stash before merge of "develop" and "origin/develop"	2022-10-09 17:06:53 +02:00
Gerkiz	b7c5fb9ffe	Remove unused modules	2022-09-30 22:24:10 +02:00
Gerkiz	93e0b5f91f	Minor fix	2022-06-26 23:40:56 +02:00
hanakocz	50469c804b	bp requesting - player can disable the feature in config menu	2022-05-16 01:02:25 +02:00
Gerkiz	24d65cb06d	fix small whitespace	2022-04-10 11:32:32 +02:00
danielmartin0	4203f740f2	adapt to new Comfy Gui	2022-04-08 23:44:41 +01:00
Gerkiz	7f8ad0b184	small tweak	2022-04-08 22:39:15 +02:00
danielmartin0	52ccfecb2d	whitespace	2022-04-08 14:55:53 +01:00
danielmartin0	12473c7f6d	re-enable some utils.gui that should be enabled on main branch	2022-04-08 14:54:22 +01:00
danielmartin0	9e4211605a	prepare for PR	2022-04-08 14:49:53 +01:00
danielmartin0	e598976ede	Merge remote-tracking branch 'upstream/develop' into develop	2022-04-08 14:46:11 +01:00
Gerkiz	bdd16d9a2f	minor change	2022-04-08 00:35:03 +02:00
Gerkiz	6e98f1c1bc	final fix	2022-04-08 00:11:10 +02:00
Gerkiz	2880571e6a	minor change	2022-04-08 00:08:40 +02:00
Gerkiz	95f2e90e55	refactor more gui	2022-04-05 19:28:08 +02:00
Gerkiz	7f7aa3a470	Merge branch 'develop' into develop	2022-03-29 21:55:34 +02:00
Gerkiz	b7315b5980	Fix freeplay and various other files	2022-03-29 20:12:50 +02:00
danielmartin0	129a94aad9	comment back in require 'maps.pirates.main'	2022-03-25 17:57:58 +00:00
danielmartin0	d87e3eb13f	commenting out require 'maps.pirates.main'	2022-03-20 11:41:34 +00:00
danielmartin0	ce80f3e108	update for luacheck	2022-03-19 21:20:55 +00:00
danielmartin0	282f28567a	fix	2022-03-19 00:10:16 +00:00
danielmartin0	e87ab12db6	v1.1.1.5.1, preparing for PR	2022-03-19 00:09:30 +00:00
danielmartin0	a8d823e46d	debug off	2022-03-11 22:54:19 +00:00
danielmartin0	ee370c9bb3	v1.1.0.0	2022-03-11 22:53:36 +00:00
danielmartin0	960b234807	Merge branch 'ComfyFactory:develop' into develop	2022-03-07 22:13:21 +00:00
danielmartin0	2386fdc426	fix	2022-03-06 01:05:42 +00:00
danielmartin0	561672881c	v1.0.4.3	2022-03-06 01:05:26 +00: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	7fc0be44c7	disable inserter_drops_pickup since it's causing desyncs	2022-03-05 17:50:02 +01:00
danielmartin0	798aac043e	debug off	2022-03-01 22:00:26 +00:00
danielmartin0	cf6cc52c4d	v1.0.3.9.6	2022-03-01 21:59:48 +00:00
danielmartin0	80de04709c	v1.0.3.1	2022-02-25 00:01:28 +00:00
danielmartin0	c59e80161a	Merge remote-tracking branch 'upstream/develop' into develop	2022-02-24 19:41:03 +00:00
danielmartin0	7ef06c265f	1.0.3.0	2022-02-24 19:39:03 +00:00
Gerkiz	bd906f8e7f	Add the ability to connect to other servers via ingame	2022-01-18 00:07:25 +01:00
hanakocz	dfa4b2598b	New module - automatically fill placed turrets with ammo	2021-12-25 23:54:27 +01:00
Gerkiz	966dcf220a	Move files in main folder to utils	2021-12-05 22:15:49 +01:00
Jacob	a2bac17e91	new module inserter_drops_pickup ... Small QoL addition to pick up an item an inserter put down on the ground. If the inventory is full after mining the item, the inserter is left behind as an item-on-ground (versus not mined at all when the inventory is full)	2021-11-08 21:58:32 -05:00
danielmartin0	29473d4ed9	v1.0.1.6	2021-10-13 14:56:49 +01:00
Gerkiz	f3cbba181e	Add supporter information to the playerlist	2021-10-09 13:45:19 +02:00
Gerkiz	7ce9894a15	two new modules and changes to scenario	2021-07-12 16:15:55 +02:00
Gerkiz	4ee808e6f3	new module - game pause ... this module pauses the game whenever the last player leaves the game, ensuring that rcon does not progress the map.	2021-05-19 19:49:57 +02:00
MewMew	33935dd3dd	New Map	2021-05-09 15:47:39 +02:00
Gerkiz	6621d854e2	new map - pigeotto	2021-05-08 15:12:33 +02:00
Gerkiz	6d9aa6645a	Fix Territorial Control	2021-05-07 01:46:27 +02:00
Gerkiz	6c4f9e5af7	rename cave choppy	2021-05-04 19:52:58 +02:00
MewMew	8825d3fe02	NEW MAP	2021-04-19 21:09:00 +02:00
Gerkiz	f76af8c582	debug and desync fixes	2021-04-04 13:51:27 +02:00