2671 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Matthew	c03b9c0cdd	Merge pull request #796 from grilledham/debugger/event_view_global_fix ... Debugger/event view global fix	2019-02-23 10:33:40 -05:00
Simon	055d6602dc	Merge pull request #798 from plague006/fix/apocalypse ... Set evolution scale when activating the apocalypse	2019-02-23 16:27:44 +01:00
plague006	0b5a22b6c8	Set evolution scale when activating the apocalypse	2019-02-23 10:20:38 -05:00
grilledham	91eaf60af8	Merge pull request #797 from grilledham/player_list/fix_donator_sort_function ... fix player_list sort by rank	2019-02-23 14:47:00 +00:00
grilledham	8050de4414	fix player_list sort by rank	2019-02-23 14:39:59 +00:00
grilledham	ee6d347b98	removed unused require	2019-02-23 14:03:54 +00:00
grilledham	ba87c468ce	on_open_debug callback	2019-02-23 13:08:47 +00:00
grilledham	a1aa2add44	Replace Global with global	2019-02-22 22:23:38 +00:00
Simon	3075b0c64d	Merge pull request #791 from SimonFlapse/evo_gui_fix ... Updating evolution gui on player joined	2019-02-22 20:43:48 +01:00
SimonFlapse	c5ad9f3f5a	Added gui update on join	2019-02-22 13:51:20 +01:00
Matthew	626fbef3b8	Merge pull request #686 from SimonFlapse/Modded-Diggy-Buffs ... [Diggy] Restoring buffs every 61 ticks	2019-02-21 17:02:39 -05:00
Matthew	6b9f6b68f4	Merge pull request #788 from plague006/event_view ... Add event toggles to debugger	2019-02-21 16:51:12 -05:00
Matthew	6d68639307	Update map_gen/maps/diggy/feature/experience.lua ... Co-Authored-By: SimonFlapse <44922798+SimonFlapse@users.noreply.github.com>	2019-02-21 22:43:01 +01:00
Matthew	a271e9afac	Update map_gen/maps/diggy/feature/experience.lua ... Co-Authored-By: SimonFlapse <44922798+SimonFlapse@users.noreply.github.com>	2019-02-21 22:42:48 +01:00
Matthew	944aaa15c7	Update map_gen/maps/diggy/feature/experience.lua ... Co-Authored-By: SimonFlapse <44922798+SimonFlapse@users.noreply.github.com>	2019-02-21 22:42:35 +01:00
Matthew	ae3160699b	Merge pull request #789 from Refactorio/plague006-patch-1 ... Add note to readme	2019-02-21 16:40:30 -05:00
Matthew	74c11132a8	Merge pull request #702 from SimonFlapse/Train-AntiGrief ... Added anti grief for trains	2019-02-21 16:39:08 -05:00
Matthew	b25f4e3b66	Merge pull request #780 from plague006/fix_regular ... Fix increase and decrease player rank functions	2019-02-21 16:32:18 -05:00
Matthew Heguy	14b83d7266	Use Model.dump	2019-02-21 15:53:49 -05:00
Matthew	9b58047e4b	Add note to readme	2019-02-21 15:00:27 -05:00
Matthew Heguy	2a397163bc	Remove todo	2019-02-21 14:32:27 -05:00
Matthew	48825b137f	Merge pull request #784 from plague006/fix/walkabout ... Fix/walkabout	2019-02-21 14:26:45 -05:00
Matthew	a4c095d338	Merge pull request #786 from Refactorio/badges ... Badges! Horrible, sweet, tacky badges!	2019-02-21 14:08:31 -05:00
Matthew Heguy	184d5fa56d	Add event toggles to debugger, increment version of debuggertron	2019-02-21 13:43:40 -05:00
SimonFlapse	1ff4cec8db	Fixed spaces after braces	2019-02-21 13:02:15 +01:00
Matthew Heguy	8f1d8abe07	Remove extra newlines	2019-02-21 04:54:21 -05:00
Matthew	7f59547aae	Add badges to readme	2019-02-21 04:52:01 -05:00
Matthew Heguy	47bda3a69f	Fix typo in Global ref	2019-02-20 21:41:08 -05:00
Matthew Heguy	84e2ee8887	Fix wrong condition	2019-02-20 19:05:48 -05:00
SimonFlapse	5fd207f81e	Fixed minimum for old_modifier	2019-02-21 00:47:16 +01:00
SimonFlapse	166be595aa	Fixed style and minimum for old_modifier	2019-02-21 00:39:49 +01:00
Matthew	dff903397c	Merge pull request #781 from plague006/fix/ent_and_terrain_modules ... Switch to functions in table, adjust map_loader accordingly	2019-02-20 17:18:01 -05:00
Matthew Heguy	16771be37b	Fix typo	2019-02-20 16:58:59 -05:00
Matthew Heguy	3af411faa5	Switch to functions in table, adjust map_loader accordingly	2019-02-20 16:38:34 -05:00
Matthew Heguy	6523efd040	Remove redundant check	2019-02-20 15:13:19 -05:00
Matthew Heguy	808c64a8e0	Fix increase and decrease player rank functions	2019-02-20 13:52:30 -05:00
Matthew Heguy	ffed15c30e	Do not punish if there are multiple passengers	2019-02-20 13:07:47 -05:00
Matthew Heguy	8907e828f5	Remove quote in locale	2019-02-20 12:40:25 -05:00
Matthew Heguy	5c362be410	print_admins to use locale	2019-02-20 12:27:03 -05:00
Matthew	92dbfb0d46	Merge pull request #778 from plague006/pr_test ... refine feature request text	2019-02-20 11:49:52 -05:00
Matthew Heguy	dee6c2f968	refine feature request text	2019-02-20 11:37:41 -05:00
Matthew Heguy	88c8d355be	Push test	2019-02-20 11:35:37 -05:00
Matthew	6984bfaf87	Merge pull request #724 from SimonFlapse/stash_prehistoric ... Added groundhogs, updated dino_island	2019-02-20 09:32:00 -05:00
Matthew Heguy	de36eb81ac	Restore uranium	2019-02-20 03:25:18 -05:00
Matthew Heguy	cb69555169	ipairs -> pairs and cleanup if/else for groundhogs	2019-02-20 03:17:09 -05:00
Matthew	0f9ad4b93f	Merge pull request #773 from theorangeangle/oldsci ... Toxic_science_jungle.lua	2019-02-20 02:43:31 -05:00
Matthew Heguy	c0461ccf62	Final cleanup	2019-02-20 02:40:58 -05:00
SimonFlapse	fafbe1dd31	Fixed linting error ... Caused by merge conflict	2019-02-20 08:26:06 +01:00
Matthew	a850f07dbd	Merge pull request #769 from plague006/banner ... New year, new banner	2019-02-20 02:12:22 -05:00
zr4g0n	e8fce58e5a	Iterate banner	2019-02-20 02:11:53 -05:00