2637 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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	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	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
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	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
theorangeangle	6ac34ea1a5	flamethrower fix	2019-02-19 20:08:05 -06:00
theorangeangle	8fef499864	Added local config changes	2019-02-19 19:49:31 -06:00
Matthew Heguy	ba5f05297f	Change options to match style of others: opposite of defaults	2019-02-19 20:02:50 -05:00
Matthew Heguy	ca7d6edbd5	Add missing comment tag	2019-02-19 19:58:56 -05:00
Matthew	7de43bbe69	Merge pull request #776 from EssGeeEich/patch-1 ... Fixed typo in peaceful_mode_on setting	2019-02-19 17:51:19 -05:00
Mauro	eb135ffdeb	Fixed typo in peaceful_mode_on setting ... Fixed typo for peaceful_mode_on that accidentally turned it off.	2019-02-19 23:17:37 +01:00
SimonFlapse	d1355fb1ad	Merge branch 'stash_prehistoric' of https://github.com/SimonFlapse/RedMew into stash_prehistoric	2019-02-19 20:35:06 +01:00
Matthew	74e724ab52	Merge pull request #774 from SimonFlapse/Diggy-fix-buffs ... Tweaking level up formula for late late game	2019-02-19 14:24:27 -05:00
Matthew	16fe4a7345	Merge pull request #742 from plague006/apply_lifecycle ... Apply lifecycle	2019-02-19 14:13:28 -05:00
plague006	3d8aecf4ae	Add config options	2019-02-19 14:04:34 -05:00
plague006	c6bcb2f2c6	Clean up linting, use entity_placement_restriction	2019-02-19 14:04:34 -05:00
SimonFlapse	b16acecc46	Added groundhogs, updated dino_island	2019-02-19 14:04:34 -05:00
Matthew	5f283c90d8	Merge pull request #723 from plague006/entity_restriction ... Add generic entity restriction module	2019-02-19 14:02:32 -05:00
grilledham	4696157555	return true for zero area bounding_box entities (bots)	2019-02-19 17:43:53 +00:00
grilledham	adb8936cd0	switched ipairs to normal for loop	2019-02-19 17:28:00 +00:00
grilledham	d07458bc84	local references in event and event core	2019-02-19 17:24:46 +00:00
SimonFlapse	34fd76592c	Tweaking level up formula for late late game ... Tweaking xp gained from infinite research to add 60% towards current level up progress. Added max level for boosts	2019-02-19 17:24:21 +01:00
SimonFlapse	c72f8fe8ba	Revert "Tweaking level up formula for late late game" ... This reverts commit c00f786241.	2019-02-19 17:09:12 +01:00
SimonFlapse	c00f786241	Tweaking level up formula for late late game ... Tweaking xp gained from infinite research to add 60% towards current level up progress. Added max level for boosts	2019-02-19 17:02:07 +01:00
SimonFlapse	b5d14f08d9	Added toggle for groundhogs	2019-02-19 14:49:51 +01:00
theorangeangle	779986d458	added back in line 256	2019-02-19 00:41:45 -06:00
theorangeangle	5f593fe275	removed market duplicate (again)	2019-02-19 00:15:31 -06:00
theorangeangle	83cde6bba0	fixed steel axe config	2019-02-19 00:13:50 -06:00
plague006	17a356aa1e	USe recipe_locker, remove duplicate line for create_standard_market	2019-02-19 00:51:34 -05:00
plague006	0fe8c61886	Add recipe_locker ... (cherry picked from commit 684fd03587c1a4c39d44afb406f86058514e901a)	2019-02-19 00:46:00 -05:00
theorangeangle	72f1cb12fb	fixed player_force reference	2019-02-18 23:36:29 -06:00
theorangeangle	2004c431ac	removed useless lines of code, damn you travis	2019-02-18 22:22:34 -06:00