48 Commits

Author	SHA1	Message	Date
Jayefuu	9ebb826152	Merge branch 'develop' into maps/christmas_tree_of_death	2018-12-14 17:32:46 +00:00
Jayefuu	0cc268bcb5	Added christmas_tree_of_terror.lua and supporting files	2018-12-14 17:29:37 +00:00
Jayefuu	6297d9358e	Added 'rotten_apples' map preset and supporting files. (#494) ... * Added 'rotten_apples' map preset and supporting files. * Added comment about market item balance.	2018-12-03 11:21:44 +01:00
Matthew	9a62febdea	Merge pull request #433 from Jayefuu/map/tetris_and_world_thanksgiving ... Add Tetris and World Thanksgiving maps	2018-11-22 22:22:03 -05:00
plague006	b6c8f32c14	Merge and move docs	2018-11-22 17:44:27 -05:00
Jayefuu	0920ad70a5	Resolved Plague's comments	2018-11-22 22:11:00 +00:00
Jayefuu	5b727f5b53	Added: ... - Tetris map and associated files - World Thanksgiving map with turkey ore preset	2018-11-22 18:39:46 +00:00
Matthew Heguy	e6dda20e41	All tabs to spaces	2018-11-21 08:42:39 -05:00
Valansch	7fa48bc583	Changed all windows style line endings to unix style line endings (#393)	2018-11-18 17:12:00 +01:00
grilledham	a995280428	vanilla map	2018-09-30 21:20:41 +01:00
grilledham	21084bc241	bacon island map	2018-08-11 12:38:12 +01:00
grilledham	d9a18d4b0f	dino_islands_map	2018-07-14 13:23:24 +01:00
grilledham	6bb2d65d58	world map	2018-07-03 12:06:27 +01:00
grilledham	21ba972dd1	world map	2018-07-02 22:31:08 +01:00
grilledham	345ed1e075	updates to world map	2018-06-29 15:04:51 +01:00
grilledham	f88aa91d8b	added world map	2018-06-27 17:14:56 +01:00
grilledham	40669a0c2a	bermuda triangle	2018-06-16 12:57:11 +01:00
grilledham	fb79d65677	added factory map	2018-06-12 12:05:32 +01:00
grilledham	d9cf7893b9	renamed data folders	2018-06-03 19:18:03 +01:00
grilledham	1e77428b04	voidgears deathworld	2018-06-02 13:28:33 +01:00
grilledham	084a155465	creation of adam2 map	2018-05-26 13:31:23 +01:00
Rickeyhb	ecbbfb84e3	Added honeycomb map	2018-04-17 10:44:38 +02:00
Rickeyhb	cec2990f37	uploaded with correct name	2018-04-13 09:10:17 +02:00
Rickeyhb	4750046ed2	wrong name	2018-04-13 09:09:57 +02:00
Rickeyhb	437cd19eaf	added plus map source image	2018-04-13 08:54:20 +02:00
Rickeyhb	f630d4b3ee	added plus map preview	2018-04-13 08:53:33 +02:00
Rickeyhb	25369989b9	added plus	2018-04-13 08:43:31 +02:00
grilledham	b6d050d2e8	added missing source images for fish islands	2018-03-27 23:54:16 +01:00
grilledham	e832eae009	added preview for cookies map	2018-03-27 23:53:53 +01:00
grilledham	6c72755d3f	added chess board	2018-03-27 16:15:57 +01:00
grilledham	69a3c82062	added cookie map	2018-03-27 16:15:43 +01:00
grilledham	039eea443f	added contraSpiral map	2018-03-24 21:00:32 +00:00
grilledham	05e1418e3a	added preview	2018-03-03 14:34:43 +00:00
grilledham	968a2a1883	add fish_islands map	2018-03-03 12:55:33 +00:00
grilledham	931707a1a8	added frui_loop preview	2018-02-23 23:45:32 +00:00
grilledham	3142dc1231	added venice map	2018-02-13 16:48:04 +00:00
grilledham	8008ef5e9e	added previews	2018-02-13 16:47:26 +00:00
grilledham	74178485f7	woman map	2018-02-04 22:12:30 +00:00
grilledham	05ba0ae8dc	added preview for factorio_logo2	2018-02-02 16:29:37 +00:00
grilledham	5108a4fe93	added factorio logo 2 map	2018-01-29 17:43:10 +00:00
grilledham	9d53105e76	removed test / unused preset files	2018-01-24 19:54:15 +00:00
grilledham	0caaf1f88e	updated / added preset data	2018-01-24 19:51:30 +00:00
grilledham	23bc3f7004	added source images	2018-01-24 19:45:16 +00:00
grilledham	809fe5c4bf	added map previews	2018-01-24 19:44:06 +00:00
grilledham	9d91494eb0	added dna preview	2018-01-21 15:30:51 +00:00
Valansch	6c92122de1	moved preset data into map_gen/data/presets #152	2018-01-19 23:10:20 +01:00
Valansch	fbe97925c3	map_gen/combined/grilledham_map_gen/data/ ==> map_gen/data/ #152	2018-01-19 22:11:36 +01:00
Maik Wild	daa9f0e892	moved map_previews #152	2018-01-19 15:04:54 +01:00