Fixed typos #152

map_gen/presets/GoT.lua

@@ -1,5 +1,5 @@
 require "map_gen.shared.generate"
-require "map_gen.combined.grilledham_map_gen.builders"
+require "map_gen.shared.builders"
 map_gen_decoratives = true
 local pic = require "map_gen.data.presets.GoT"
 local pic = decompress(pic)

map_gen/presets/UK.lua

@@ -1,4 +1,4 @@
-require "map_gen.combined.grilledham_map_gen.builders"
+require "map_gen.shared.builders"
 
 local pic = require "map_gen.data.presets.UK"
 local pic = decompress(pic)

map_gen/presets/antfarm.lua

@@ -1,5 +1,5 @@
-require ".shared.generate"
-require "map_gen.combined.grilledham_map_gen.builders"
+require "map_gen.shared.generate"
+require "map_gen.shared.builders"
 
 local pic = require "map_gen.data.presets.antfarm"
 
@@ -14,4 +14,4 @@ map = scale(map, scale_factor, scale_factor)
 --map = change_tile(map, false, "water")
 --map = change_map_gen_collision_tile(map, "water-tile", "grass-1")
 
-return map
+return map

map_gen/presets/cage.lua

@@ -1,5 +1,5 @@
 require "map_gen.shared.generate"
-require "map_gen.combined.grilledham_map_gen.builders"
+require "map_gen.shared.builders"
 
 local pic = require "map_gen.data.presets.cage"
 

map_gen/presets/connected_dots.lua

@@ -1,5 +1,5 @@
 require "map_gen.shared.generate"
-require "map_gen.combined.grilledham_map_gen.builders"
+require "map_gen.shared.builders"
 
 local function no_resources(x, y, world_x, world_y, tile, entity)
     local surface = MAP_GEN_SURFACE

map_gen/presets/creation_of_adam.lua

@@ -1,5 +1,5 @@
 require "map_gen.shared.generate"
-require "map_gen.combined.grilledham_map_gen.builders"
+require "map_gen.shared.builders"
 
 local pic = require "map_gen.data.presets.creation_of_adam2"
 

map_gen/presets/goat.lua

@@ -1,5 +1,5 @@
 require "map_gen.shared.generate"
-require "map_gen.combined.grilledham_map_gen.builders"
+require "map_gen.shared.builders"
 
 local pic = require "map_gen.data.presets.goat"
 

map_gen/presets/lines_and_balls.lua

@@ -4,7 +4,7 @@ map_gen_rows_per_tick = 4 -- Inclusive integer between 1 and 32. Used for map_ge
 -- Recommend to use map_gen, but map_gen_not_threaded may be useful for testing / debugging.
 require "map_gen.shared.generate_not_threaded"
 --require "map_gen.shared.generate"
-require "map_gen.combined.grilledham_map_gen.builders"
+require "map_gen.shared.builders"
 
 local big_circle = circle_builder(150)
 local small_circle = circle_builder(140)

map_gen/presets/manhattan.lua

@@ -1,5 +1,5 @@
 require "map_gen.shared.generate"
-require "map_gen.combined.grilledham_map_gen.builders"
+require "map_gen.shared.builders"
 
 local pic = require "map_gen.data.presets.manhattan"
 

map_gen/presets/maori.lua

@@ -1,5 +1,5 @@
 require "map_gen.shared.generate"
-require "map_gen.combined.grilledham_map_gen.builders"
+require "map_gen.shared.builders"
 
 local pic = require "map_gen.data.presets.maori"
 

map_gen/presets/mobius_strip.lua

@@ -1,5 +1,5 @@
 require "map_gen.shared.generate"
-require "map_gen.combined.grilledham_map_gen.builders"
+require "map_gen.shared.builders"
 
 local inner_circle = invert(circle_builder(48))
 local outer_circle = circle_builder(64)

map_gen/presets/mona_lisa.lua

@@ -1,5 +1,5 @@
 require "map_gen.shared.generate"
-require "map_gen.combined.grilledham_map_gen.builders"
+require "map_gen.shared.builders"
 
 local pic = require "map_gen.data.presets.color_mona_lisa"
 

map_gen/shared/generate.lua

@@ -1,4 +1,4 @@
-require("map_gen.combined.grilledham_map_gen.builders")
+require("map_gen.shared.builders")
 require("utils.poisson_rng")
 
 local Thread = require "utils.Thread"

map_gen/shared/generate_not_threaded.lua

@@ -1,4 +1,4 @@
-require("map_gen.combined.grilledham_map_gen.builders")
+require("map_gen.shared.builders")
 require("utils.poisson_rng")
 
 local function do_row(row, data)