3701 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Gerkiz	84b28e1812	Merge pull request #342 from ComfyFactory/towny ... Towny - fix reset 1.0.63	2022-10-21 22:41:07 +02:00
Gerkiz	0046cfa47e	Towny - fix reset	2022-10-21 22:39:45 +02:00
Gerkiz	d0e1ac05bf	Towny - fix broken loot 1.0.62	2022-10-21 22:18:50 +02:00
Gerkiz	764a237e3e	Towny - small fix 1.0.61	2022-10-21 22:13:27 +02:00
Gerkiz	ed756e4f52	Merge pull request #341 from ComfyFactory/tweaks_server ... Changes 1.0.60	2022-10-21 21:57:05 +02:00
Gerkiz	b4cdf26c60	Remove require from control	2022-10-21 21:56:03 +02:00
Gerkiz	af15c20445	Handle changes when git does callbacks	2022-10-21 21:54:06 +02:00
Gerkiz	2a3eab8521	Server - add new backend commands	2022-10-21 21:49:49 +02:00
Gerkiz	28503e6a36	Antigrief - increase the entity limit when decon	2022-10-21 21:49:32 +02:00
Gerkiz	f8eed9baab	Scrap Towny - minor changes	2022-10-21 21:49:17 +02:00
Gerkiz	ebed7f49e0	Merge remote-tracking branch 'origin/develop' into develop	2022-10-21 19:06:05 +02:00
Gerkiz	2a1c2a237a	Merge pull request #337 from fuchsnj/fuchsnj/suicide_command ... add suicide command (for Towny) 1.0.59	2022-10-21 19:05:44 +02:00
Gerkiz	73066f1e7b	Remove unused vars	2022-10-21 19:04:45 +02:00
Nathan Fox	52b44a9840	Merge branch 'develop' into fuchsnj/suicide_command	2022-10-19 22:52:52 -04:00
Nathan Fox	937bdeb5be	cleanup	2022-10-19 22:52:20 -04:00
Nathan Fox	6a64d80c79	cleanup	2022-10-19 22:51:59 -04:00
Nathan Fox	050a09f3fc	switch to scheduler	2022-10-19 22:51:01 -04:00
Gerkiz	195c82a6d6	Merge pull request #339 from blubFisch/develop-blub ... Towny: Bunch of balance and text updates 1.0.58	2022-10-18 19:55:48 +02:00
Gerkiz	0199ff7d0e	Merge branch 'develop' into develop-blub	2022-10-18 19:52:17 +02:00
blubFisch	80a8d64987	Scrap rebalance	2022-10-18 18:51:46 +01:00
Gerkiz	e13b6ab45d	Merge pull request #338 from Agocelt/MF-small-fixes ... Mf small fixes 1.0.57	2022-10-18 17:52:15 +02:00
Johny	fc7c0bf9f6	Addind coin nerf to forest zone	2022-10-18 17:41:52 +02:00
Johny	9c4787a962	Fixing uneven distribution of half points in RPG	2022-10-18 17:41:08 +02:00
Nathan Fox	9b19af539f	cleanup	2022-10-17 22:24:10 -04:00
Nathan Fox	a8f26a7da5	prevent resetting suicide	2022-10-17 22:23:26 -04:00
Nathan Fox	3964ddec72	add timer to suicide	2022-10-17 22:11:38 -04:00
Nathan Fox	eaf754f18b	cleanup	2022-10-16 14:01:54 -04:00
Nathan Fox	a7aa422f58	add suicide command	2022-10-16 13:53:54 -04:00
blubFisch	f82b444d1e	Rebalance	2022-10-16 16:13:08 +01:00
blubFisch	1cf9c48d28	Info	2022-10-16 14:05:03 +01:00
blubFisch	9f0d7ce974	Info	2022-10-16 14:03:26 +01:00
blubFisch	1fccead964	Info	2022-10-16 12:41:06 +01:00
Gerkiz	d59a542ea7	Merge pull request #336 from blubFisch/develop-blub ... Develop blub 1.0.56	2022-10-16 13:32:35 +02:00
blubFisch	d0dc8da4f4	Remove unused	2022-10-16 12:19:46 +01:00
blubFisch	225abff724	Adjustments	2022-10-16 12:17:52 +01:00
blubFisch	33c1949e56	Fix bad ref	2022-10-16 12:14:38 +01:00
blubFisch	e86dd28e3e	Prevent building in shielded area	2022-10-16 12:11:47 +01:00
blubFisch	f945ab772b	Text updates	2022-10-15 15:45:49 +01:00
blubFisch	da380f80f9	Scrap rebalance	2022-10-15 14:46:25 +01:00
blubFisch	d6494a87f2	Scrap rebalance	2022-10-15 14:06:21 +01:00
blubFisch	e6a22eba59	Team limit rewrite	2022-10-15 14:05:35 +01:00
blubFisch	7bdec964d8	Adjust loot	2022-10-15 13:11:18 +01:00
blubFisch	74a3f193ab	Changelog	2022-10-15 12:52:13 +01:00
blubFisch	7e39e8782e	Merge branch 'develop-blub' of github.com:blubFisch/ComfyFactorio into develop-blub	2022-10-15 12:42:52 +01:00
blubFisch	0ae12def45	More town name fixes	2022-10-15 12:42:34 +01:00
Gerkiz	ff064a6d2a	Merge pull request #335 from blubFisch/develop-blub ... Small stuff 1.0.55	2022-10-15 13:41:12 +02:00
Gerkiz	4dc7ef8a0d	Merge branch 'develop' into develop-blub	2022-10-15 13:37:20 +02:00
blubFisch	a4ac17f445	Town name fixes and simplifications	2022-10-15 12:36:01 +01:00
blubFisch	32a8825908	Fix some bad refs	2022-10-15 12:23:11 +01:00
Gerkiz	24c685aaa0	Merge pull request #334 from blubFisch/develop-blub ... Combat rebalance + random fixes 1.0.54	2022-10-15 13:08:01 +02:00