3242 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
danielmartin0	389d2f2c56	nonfunctional change	2022-05-22 23:39:25 +01:00
danielmartin0	590cc7c17f	prepare for comfy merge	2022-05-22 23:37:47 +01:00
danielmartin0	526d25d9a1	patch and balance	2022-05-22 23:26:50 +01:00
danielmartin0	37dd892da2	patch	2022-05-22 23:20:30 +01:00
danielmartin0	24c98c2b87	v1.2.1	2022-05-22 23:11:52 +01:00
Gerkiz	01a9e016c7	Merge pull request #268 from ComfyFactory/rpg ... rpg - minor fix to char movement speed restore	2022-05-20 10:35:15 +02:00
Gerkiz	30a6264041	rpg - minor fix	2022-05-20 10:33:11 +02:00
hanakocz	7ee89ad7cc	Merge pull request #265 from ComfyFactory/blueprint_requesting ... module to set requests in logi chests to blueprint total costs	2022-05-19 23:36:41 +02:00
hanakocz	ee2627d16b	more lang fixes	2022-05-16 02:23:59 +02:00
hanakocz	7ebe7a7065	minor change in lang	2022-05-16 02:22:05 +02:00
hanakocz	50469c804b	bp requesting - player can disable the feature in config menu	2022-05-16 01:02:25 +02:00
Gerkiz	383aa4f244	Merge branch 'develop' into blueprint_requesting	2022-05-15 02:24:15 +02:00
Gerkiz	bfef5682f6	Merge pull request #267 from ComfyFactory/mtn_v3 ... mtn v3 - fix minor issue	2022-05-15 02:22:49 +02:00
Gerkiz	82f00a4a3e	mtn v3 - fix minor issue	2022-05-15 02:20:06 +02:00
Gerkiz	7ea835d465	Merge branch 'develop' into blueprint_requesting	2022-05-15 01:31:56 +02:00
Gerkiz	be6476c740	Merge pull request #266 from ComfyFactory/mtn_v3 ... mtn v3 - fix cheesing	2022-05-15 01:31:49 +02:00
Gerkiz	8d5c00512e	mtn v3 - fix cheesing	2022-05-15 01:24:16 +02:00
hanakocz	49781aef5c	Merge branch 'develop' into blueprint_requesting	2022-05-15 01:03:22 +02:00
hanakocz	f121bbd8ca	module to set requests in logi chests to blueprint total costs	2022-05-15 00:55:36 +02:00
Gerkiz	e180e89166	Merge pull request #264 from ComfyFactory/collapse_fix ... Collapse fix	2022-05-14 19:17:27 +02:00
Gerkiz	c2d272e8bb	Collapse fix	2022-05-14 19:15:51 +02:00
danielmartin0	0648828cff	starting to build alt covered structures	2022-05-13 23:35:12 +01:00
Gerkiz	acc2b66aac	Merge pull request #263 from ComfyFactory/fixes ... Fix to wave defense and mtn v3	2022-05-12 22:23:18 +02:00
Gerkiz	f0560c1d27	misc fixes	2022-05-12 22:22:03 +02:00
Gerkiz	44af53da8c	fix that magic required level 51 to work	2022-05-12 22:21:49 +02:00
Gerkiz	6167ab4ec1	fix that buried biters were not scaled with normal wave defense module	2022-05-12 22:21:36 +02:00
Gerkiz	88ca129769	fix movement speed bug	2022-05-12 22:21:15 +02:00
Gerkiz	e50243a20b	wave defense - fixes	2022-05-12 22:19:00 +02:00
danielmartin0	8fd3c7ff67	Merge branch 'develop' of https://github.com/danielmartin0/ComfyFactorio-Pirates into develop	2022-05-09 00:36:51 +01:00
danielmartin0	e553658e09	adjustments	2022-05-09 00:36:48 +01:00
Gerkiz	e2f7c5488d	Merge pull request #261 from danielmartin0/develop ... PS milestone version	2022-05-08 23:28:00 +02:00
Gerkiz	8b0b437a7d	Merge branch 'develop' into develop	2022-05-08 23:24:58 +02:00
Gerkiz	937911847f	Merge pull request #262 from ComfyFactory/mtn_v3 ... mtn v3 - small tweak to breached wall	2022-05-08 23:07:37 +02:00
Gerkiz	1a47ebc089	mtn v3 - small tweak to breached wall	2022-05-08 23:06:31 +02:00
danielmartin0	f2434d6a54	luacheck fix	2022-05-08 11:06:37 +01:00
danielmartin0	229fbe82b6	luacheck fix	2022-05-08 11:06:22 +01:00
danielmartin0	9e8cb6322a	quick rebalance	2022-05-08 10:47:48 +01:00
danielmartin0	50e8076067	fix control.lua for merge	2022-05-08 10:45:34 +01:00
danielmartin0	1ff3c8f5bd	Merge remote-tracking branch 'upstream/develop' into develop	2022-05-08 10:32:41 +01:00
danielmartin0	6b1fc8e341	small balance	2022-05-08 10:25:21 +01:00
Gerkiz	25c2608b7a	Merge pull request #260 from ComfyFactory/rpg_fix ... Rpg spells - fix capsules	2022-05-08 10:54:50 +02:00
Gerkiz	e83b239282	Merge branch 'develop' into rpg_fix	2022-05-08 10:53:36 +02:00
Gerkiz	ff3c33956d	Merge pull request #259 from eric-anderson/dungeons_1.1.1 ... Dungeons 1.1.1 - Rebalance based on main Comfy server playthrough	2022-05-08 10:53:29 +02:00
Gerkiz	d7a502d8fb	Rpg spells - fix capsules	2022-05-08 10:51:48 +02:00
danielmartin0	1252134ec8	luacheck update	2022-05-07 21:59:15 +01:00
danielmartin0	0910c3ea31	luacheck update	2022-05-07 21:56:16 +01:00
danielmartin0	c068fc68e5	v1.1.2.2.2 ... fixes and balance	2022-05-07 21:41:45 +01:00
danielmartin0	1ba20103c4	v1.1.2.2.0 ... small changes	2022-05-06 16:16:15 +01:00
danielmartin0	1e1a070993	v1.1.2.1.4 ... small fixes	2022-05-06 13:43:59 +01:00
danielmartin0	b49db03fb8	v1.1.2.1.3 ... - Coin requisitioning replaced by a 'tax' that takes only 25% of each player's coins - Scaled up coin economy; every biter kill now provides at least one coin; rocket coin rewards now default to the second reward chest - Deckhand nerfed	2022-05-06 13:00:57 +01:00