1073 Commits

Author	SHA1	Message	Date
SimonFlapse	5975942db8	(Hoping to fix the removed cutscene changes) ... Revert "Revert "Merge pull request #947 from SimonFlapse/diggy_cutscene"" This reverts commit 0f87f7040a.	2019-10-10 11:01:16 +02:00
SimonFlapse	16810d4a67	Fixed pollution and updated map_settings reference	2019-10-10 10:40:32 +02:00
SimonFlapse	4d33c46b76	Merge remote-tracking branch 'upstream/develop' into mapmodify-3	2019-10-10 10:25:16 +02:00
SimonFlapse	99fe5a8d88	Restricted landfill to 'water' (connected_dots)	2019-10-10 10:24:41 +02:00
grilledham	c6fd8ec4ea	Merge pull request #980 from Jayefuu/branch ... Added rail_grid map preset and preview	2019-10-05 11:45:11 +01:00
Simon	3997f6ffb3	Toxic Jungle Danger Ores Fixes (#986) ... * Fixed danger ores and removed flamethrower ammo recipe * disabled draw_resource_selection Disabled map_gen ore, oil and cliffs. Added map info	2019-10-04 21:01:11 +02:00
grilledham	661cd205a4	fixed comment	2019-09-28 14:33:27 +01:00
grilledham	ea7c027495	travis linting	2019-09-28 14:31:19 +01:00
grilledham	781cd11178	refactor rail_grid	2019-09-28 14:23:57 +01:00
curiosity	03dba62d30	Refactoring	2019-09-15 12:00:23 +03:00
curiosity	9dd4f8a3bb	Refactoring	2019-09-15 11:47:18 +03:00
curiosity	f3ebccce0b	Fix stress corruption caused by water #552	2019-09-14 19:40:43 +03:00
grilledham	e96cbfa680	Added Builders.change_map_gen_tiles(shape, new_tile_map).	2019-09-11 20:51:04 +01:00
Jayefuu	1ad53c842d	Added rail_grid lua and png files. Suitable for vanilla but also used on modded.	2019-09-11 19:31:38 +01:00
grilledham	def7d53da2	fix require for Popup.player	2019-09-08 13:18:50 +01:00
theorangeangle	0f87f7040a	Revert "Merge pull request #947 from SimonFlapse/diggy_cutscene" ... This reverts commit fc1d1af9d8, reversing changes made to 7d56edd582.	2019-09-01 22:01:32 -05:00
theorangeangle	b7be1388cd	Merge pull request #947 from SimonFlapse/diggy_cutscene ... Cutscene Controller	2019-09-01 20:23:37 -05:00
grilledham	16a0f3cb09	reduce number of trees correctly	2019-09-01 20:23:35 -05:00
grilledham	48a4cd6d93	less trees	2019-09-01 20:23:33 -05:00
grilledham	60cc102c7a	0.17.60 oil changes	2019-09-01 20:23:30 -05:00
grilledham	0bf02b92fd	desert preset	2019-09-01 20:23:28 -05:00
grilledham	fc7ed1e735	refactor to allow multiple crashsite presets	2019-09-01 20:23:27 -05:00
grilledham	cf835fcf32	spawn market to neutral force	2019-09-01 20:23:25 -05:00
grilledham	b9354c614d	reverted small oil refinery changes	2019-09-01 20:23:23 -05:00
grilledham	eac5daa56f	increased advanced circuit output	2019-09-01 20:23:22 -05:00
grilledham	20e836c47e	outpost balance	2019-09-01 20:23:21 -05:00
theorangeangle	c2b454a775	Merge pull request #953 from theorangeangle/mapmodify-3 ... Mapmodify 3	2019-09-01 20:23:20 -05:00
theorangeangle	fc1d1af9d8	Merge pull request #947 from SimonFlapse/diggy_cutscene ... Cutscene Controller	2019-08-31 20:52:28 -05:00
theorangeangle	616541bee9	fixed whitespace and added map preview for "loading screen"	2019-08-28 22:13:54 -05:00
theorangeangle	c5d09f50fa	fixed broken image sprite and replaced with a parity	2019-08-28 21:40:27 -05:00
grilledham	3e28c29a70	reduce number of trees correctly	2019-08-03 14:26:34 +01:00
grilledham	afa2019faa	less trees	2019-08-03 12:16:19 +01:00
grilledham	0eb844b17f	0.17.60 oil changes	2019-07-30 17:30:47 +01:00
grilledham	54ff569235	desert preset	2019-07-28 11:44:21 +01:00
grilledham	119ce340bb	refactor to allow multiple crashsite presets	2019-07-28 11:44:13 +01:00
grilledham	3941937400	spawn market to neutral force	2019-07-27 12:00:18 +01:00
grilledham	bac91762a3	reverted small oil refinery changes	2019-07-25 16:21:56 +01:00
grilledham	5b6b46047e	increased advanced circuit output	2019-07-25 16:21:26 +01:00
grilledham	c7c6120f55	outpost balance	2019-07-21 18:37:03 +01:00
theorangeangle	5607e7a50b	Merge pull request #953 from theorangeangle/mapmodify-3 ... Mapmodify 3	2019-07-17 04:38:50 -04:00
SimonFlapse	b431628b86	Removed game.print statements	2019-07-07 20:54:37 +02:00
SimonFlapse	d07ea062fe	Merge remote-tracking branch 'origin/diggy_cutscene' into diggy_cutscene	2019-06-22 16:53:26 +02:00
SimonFlapse	40131895f0	Added ability to fit to edges based on the top left corner	2019-06-22 16:53:18 +02:00
Simon	890cdf12e7	Merge branch 'develop' into diggy_cutscene	2019-06-22 15:11:56 +02:00
grilledham	4bd81a89e0	set chest to be on player force	2019-06-22 09:45:09 +01:00
grilledham	869371cb2a	added burner inserter to spawn	2019-06-22 09:41:45 +01:00
grilledham	2ba2086618	respawn power poles	2019-06-21 21:29:35 +01:00
theorangeangle	c7f57d257e	fixed the shit i broke in the last commit, hopefully	2019-06-20 22:49:09 -05:00
theorangeangle	571b06eadb	Revert "renamed "factorio_logo2" to "factory_squared"; removed "factorio_logo" and its preview image; fixed info and disabled market module for christmas tree of terror." ... This reverts commit b8d994a7f6.	2019-06-20 22:43:12 -05:00
theorangeangle	c2cbcc4a0b	added map info and disabled landfill on DNA; added map preview and info for double beach	2019-06-20 22:35:51 -05:00