4937 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Gerkiz	684714660b	Merge latest	2024-12-10 00:00:04 +01:00
Gerkiz	a0659d4bae	Fix control	2024-12-09 23:59:49 +01:00
hanakocz	1b6a2dc2c0	Journey more fixes + dump_env helpers fix	2024-12-09 01:32:31 +01:00
hanakocz	d939797fa3	Journey fix for oceanic + wasteland	2024-12-08 19:32:52 +01:00
hanakocz	02e3fcb229	Journey small fix;	2024-12-08 19:01:23 +01:00
hanakocz	cbfd787f6f	Journey more fixes	2024-12-04 23:09:50 +01:00
hanakocz	84eabe233c	Merge pull request #486 from ComfyFactory/journey_fixes ... Journey fixes for physical position	2024-12-04 21:22:27 +01:00
hanakocz	3b04bb3887	Journey fixes for physical position	2024-12-04 21:20:28 +01:00
Gerkiz	c4e70db933	WD: Fix wrong force warnings	2024-11-26 08:26:16 +01:00
Gerkiz	28c9baae2b	Mtn: Fix research changes	2024-11-26 08:22:36 +01:00
Gerkiz	3ae9f83058	Mtn: fix bugs with productions and mystical chest	2024-11-24 19:21:22 +01:00
Gerkiz	2e46c16d31	Rpg: fix that spells were usable in every surface	2024-11-24 19:21:03 +01:00
Gerkiz	5eb3c7f68e	Mtn: fix chart bug	2024-11-21 23:03:20 +01:00
Gerkiz	80a99e4f17	Push fix for jail handler and bug fixes for Mtn	2024-11-19 13:54:09 +01:00
Gerkiz	d2fdba2988	Fix seed issue for vanilla marathon	2024-11-14 22:18:05 +01:00
Gerkiz	25cd919a53	Push custom scenario	2024-11-14 21:52:30 +01:00
Gerkiz	7e92382315	Mtn: fix minimap bug	2024-11-13 21:18:12 +01:00
Gerkiz	0a6b8f25a5	Mtn: balance fix	2024-11-13 20:19:33 +01:00
Gerkiz	b095270f41	Fix fish defender v2	2024-11-12 21:16:17 +01:00
Gerkiz	fa4db3891f	Mtn: fix locomotive issue	2024-11-11 18:47:52 +01:00
Gerkiz	81a167f081	Mtn: Add item to inventory even if armor is missing	2024-11-11 14:30:31 +01:00
Gerkiz	d9059ca14d	Fix broken stuff ... Locomotive is invalid when the run starts, therefore the game_over gets set to true, this is now fixed.	2024-11-11 14:25:14 +01:00
Gerkiz	4748c237ec	Push bug fixes and tweaks	2024-11-11 08:57:27 +01:00
Gerkiz	50a8be2866	Fix broken stuff	2024-11-10 22:10:11 +01:00
Gerkiz	4579e97c64	Mtn: fix collapse hanging when utilizing LuaSurface::find_tiles_filtered	2024-11-10 16:36:42 +01:00
Gerkiz	0e69b99b40	Antigrief - check when someone marks an entity for upgrade	2024-11-10 12:56:22 +01:00
Gerkiz	51e332e5d6	Freeplay: fix character destructible	2024-11-10 12:53:01 +01:00
Gerkiz	e29d2a4763	Fix freeplay issues	2024-11-10 12:51:28 +01:00
Gerkiz	724777a021	Fix various bugs	2024-11-10 12:43:36 +01:00
Gerkiz	7d9c42bbf3	Merge branch 'develop' of https://github.com/ComfyFactory/ComfyFactorio into develop	2024-11-10 11:00:29 +01:00
Gerkiz	8436370491	Fix luacheck	2024-11-08 21:58:10 +01:00
Gerkiz	dca343b775	Mtn: fix various bugs	2024-11-08 21:56:53 +01:00
Gerkiz	d4f42ab51e	Merge pull request #484 from ComfyFactory/robot_limiting ... robot limiter initial version	2024-11-08 18:23:40 +01:00
hanakocz	ca6f2420e2	added missing functions	2024-11-07 21:29:30 +01:00
hanakocz	eee1c26842	robot limiter initial version	2024-11-07 21:21:40 +01:00
Gerkiz	41a56873d2	Push fixes for Mtn and Fish	2024-11-06 23:51:45 +01:00
Gerkiz	2facdbffda	Fish: fix flying-text	2024-11-06 22:03:23 +01:00
Gerkiz	cb2cd16e2a	Fix fish defender v2 (again?)	2024-11-06 19:44:18 +01:00
Gerkiz	72eb140f83	Map change and module change	2024-11-06 11:22:36 +01:00
Gerkiz	d464c5f334	Mtn: draw notice if modded	2024-11-05 20:30:29 +01:00
Gerkiz	0ed48b251c	Fix autostash	2024-11-05 20:11:43 +01:00
Gerkiz	edf5a347d5	Fix modules	2024-11-05 20:10:48 +01:00
Gerkiz	2ff53ea036	Mtn: push changes for modded	2024-11-05 20:04:00 +01:00
Gerkiz	dd1c0024c0	Merge branch 'develop' of https://github.com/ComfyFactory/ComfyFactorio into develop	2024-11-04 19:58:44 +01:00
Gerkiz	c70c063a51	Fix collapse	2024-11-04 19:58:40 +01:00
Gerkiz	420ea08121	Merge pull request #483 from Astorin/develop ... RU locale updates (Mtn Fortress v3, RPG, Pirates)	2024-11-04 18:29:58 +01:00
Shadow_Man	e976cbe6ea	RU locale updates (Mtn Fortress v3, RPG, Pirates)	2024-11-04 17:47:42 +02:00
Gerkiz	c9e4687299	Merge pull request #482 from danielmartin0/stylua-ignore ... Add stylua.toml to .gitignore	2024-11-03 15:36:43 +01:00
danielmartin0	6bc82801b1	Merge branch 'develop' into stylua-ignore	2024-11-03 13:47:23 +00:00
danielmartin0	820f69a003	Update .gitignore	2024-11-03 13:45:54 +00:00