4902 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Gerkiz	91ccd63c05	Mtn: small fixes	2024-11-02 22:50:47 +01:00
Gerkiz	f2741c967e	Mtn: fix rocket launch bug	2024-11-02 12:09:08 +01:00
Gerkiz	ac586af731	Mtn: replace landfill with nuclear-ground	2024-11-02 11:02:19 +01:00
Gerkiz	706fa73132	Mtn: fix luacheck	2024-11-02 10:39:16 +01:00
Gerkiz	b4daaa6497	Mtn: Fix no white science on rocket launch	2024-11-02 10:34:48 +01:00
danielmartin0	c8c52e9f1a	Merge branch 'develop' into stylua-ignore	2024-11-01 15:49:32 +00:00
Gerkiz	6f5e8a7765	Mtn: display better text when completing an objective	2024-11-01 10:59:29 +01:00
Gerkiz	1ea6e371ff	Merge branch 'develop' of https://github.com/ComfyFactory/ComfyFactorio into develop	2024-11-01 10:52:12 +01:00
Gerkiz	604ba247ab	Fix broken stuff	2024-11-01 10:51:36 +01:00
danielmartin0	11d401223d	Update .gitignore	2024-10-30 21:40:25 +00:00
Gerkiz	b00900dbb1	Merge pull request #481 from danielmartin0/pirates ... Pirate Ship update for Vanilla 2.0	2024-10-30 18:55:38 +01:00
Gerkiz	bb9a056351	Merge branch 'develop' into pirates	2024-10-30 18:54:25 +01:00
Gerkiz	474347231a	Mtn: fix weird bug	2024-10-30 18:54:04 +01:00
danielmartin0	767ff99df4	bump version	2024-10-29 17:37:03 +00:00
danielmartin0	a98c504ee9	reinstate discarded line	2024-10-29 17:36:50 +00:00
danielmartin0	1594f0a472	luacheck	2024-10-29 17:29:15 +00:00
danielmartin0	71aa65cfd2	luacheck	2024-10-29 14:22:52 +00:00
danielmartin0	84bcafa167	fix repeatedly calling init	2024-10-29 14:11:14 +00:00
danielmartin0	d078e3d9c7	Update coredata.lua	2024-10-29 14:11:14 +00:00
danielmartin0	77d5b2ea13	rebalance shotguns due to base game changes	2024-10-29 14:11:14 +00:00
danielmartin0	34238df885	update ammo categories	2024-10-29 14:11:14 +00:00
danielmartin0	e1cf855fcc	Fix turret nerfs	2024-10-29 14:11:14 +00:00
danielmartin0	aa3a90021c	bump version	2024-10-29 14:11:14 +00:00
danielmartin0	dabeee0b41	Update pirates.cfg	2024-10-29 14:11:14 +00:00
danielmartin0	337579040a	Re-open GUI of teleported items when the boat moves	2024-10-29 14:11:14 +00:00
danielmartin0	d5c40d6cd1	shaman fix	2024-10-29 14:11:14 +00:00
danielmartin0	4ded92482b	Update coredata.lua	2024-10-29 14:11:14 +00:00
danielmartin0	548e74b862	bugfixes	2024-10-29 14:11:14 +00:00
danielmartin0	4abebfbafa	fix using space age deco	2024-10-29 14:11:14 +00:00
danielmartin0	7232f90607	fix map_being_loaded_destination_index	2024-10-29 14:11:14 +00:00
danielmartin0	0b75a8c8a2	less decorative spam in memory	2024-10-29 14:11:14 +00:00
danielmartin0	56dbf762ea	rework treasure maps	2024-10-29 14:11:14 +00:00
danielmartin0	c2c411a9d5	fix render layers	2024-10-29 14:11:14 +00:00
danielmartin0	3b54e2c829	fix info	2024-10-29 14:11:14 +00:00
danielmartin0	157725a38c	Revert "flag -> skull" ... This reverts commit bead0a6affd5bba187e8f0f50f05836127daf893.	2024-10-29 14:11:14 +00:00