1
0
mirror of https://github.com/Refactorio/RedMew.git synced 2024-12-12 10:04:40 +02:00
Commit Graph

3217 Commits

Author SHA1 Message Date
Valansch
8fb3de797a Merge branch 'develop' into reconstruct_dev 2017-09-21 23:09:01 +02:00
Valansch
a97765448b added borg 2017-09-21 22:42:14 +02:00
Valansch
bd8ed14ccf Merge pull request #58 from TWLTriston/develop-tris
Glitter Ores Map Generation
2017-09-21 11:11:58 +02:00
TWLTriston
d694ccc3ea Whitespace style cleanups 2017-09-21 04:49:29 -04:00
TWLTriston
ccd810b008 Style updates 2017-09-21 04:48:34 -04:00
TWLTriston
5ec048903e Fixes to swap local to global
Moved init to a one time call function
Fixed bug with mixed ores that caused tiles to be skipped
2017-09-20 19:14:10 -04:00
TWLTriston
b419f5a426 Added sprinkle factor to allow for each ore entity to have a 1-100% chance of being swapped. 2017-09-20 16:43:49 -04:00
TWLTriston
f923ab9ca1 Merge branch 'develop-tris' of https://github.com/TWLTriston/RedMew into develop-tris
# Conflicts:
#	locale/gen_ores/glitter_ores.lua
2017-09-20 16:30:33 -04:00
TWLTriston
1a3bf58abe Added glittery ores generation, there is tweaks for amount of ore generated 2017-09-20 16:26:50 -04:00
TWLTriston
dc4c9884b4 Added glittery ores generation, there is tweaks for amount of ore generated 2017-09-20 16:01:57 -04:00
Myles Angell
e00680c9cf Merge pull request #1 from Valansch/master
Create LICENSE
2017-09-20 10:04:53 -04:00
Valansch
21935c4cc9 Create LICENSE 2017-09-17 23:11:08 +02:00
Valansch
1b16a979fe Added redplanet 2. All credit goes to @M3wM3w #3 2017-09-13 23:52:49 +02:00
Valansch
6ae85b5512 Made mods/regulars not case sensetive. 2017-09-10 16:26:37 +02:00
Valansch
eae8ab39db added nil check to walk_distance_on_second() #51 2017-09-10 16:01:03 +02:00
Valansch
05d24c94c3 Changing a user group member now updates a lua parsable file in the script output folder #42
- update regulars/mods list
- cleaned up config
2017-09-09 23:42:26 +02:00
Valansch
e989c8e37f Removed error when a fish is mined and fixed walk distance calculation #51 2017-09-09 22:26:31 +02:00
Valansch
b311be2190 Merge pull request #52 from grilledham/feature-poke-messages
Moved pokemessages into a seperate file and added more.
2017-09-09 21:27:17 +02:00
James Gillham
b9c01295ae changed poke message 2017-09-09 11:59:34 +01:00
James Gillham
8830329ee0 changed poke message 2017-09-09 11:58:21 +01:00
James Gillham
dced053537 moved poke_messages 2017-09-09 11:55:31 +01:00
James Gillham
6587263a04 moved regulars and mods 2017-09-09 11:55:18 +01:00
James Gillham
65f9d51f91 moved band_roles 2017-09-09 11:54:34 +01:00
James Gillham
45716bc08e moved poke_messages and added more 2017-09-09 11:54:10 +01:00
James Gillham
ca0f1cc2bc moved band_roles 2017-09-09 11:53:06 +01:00
James Gillham
1c8453d2fc changed poke message 2017-09-08 18:30:56 +01:00
James Gillham
ff7eaa5dae changed poke message 2017-09-08 10:28:40 +01:00
James Gillham
7d014c3b3e Moved pokemessages into a seperate file and add more. 2017-09-08 10:12:11 +01:00
Valansch
5adc78f349 Fixed crash on /regular when player was already a regular 2017-09-03 20:13:50 +02:00
Valansch
38c10bdeb9 Merge pull request #50 from grilledham/rusky-pvp
Rusky pvp
2017-09-03 12:48:06 +02:00
James Gillham
1e688a0b88 moved rusky_pvp.lua to gen_misc 2017-09-03 11:43:25 +01:00
James Gillham
ea2ddd41b2 moved require rusky-pvp to map_layout 2017-09-03 11:35:55 +01:00
Valansch
c01303411a Made some command functions local 2017-09-03 12:29:19 +02:00
Valansch
dc32f633fb Merge pull request #48 from Valansch/develop
Develop
2017-09-03 12:20:42 +02:00
Valansch
841feb9e27 made grilleds well console save #43 2017-09-03 12:12:28 +02:00
Valansch
ea540a4a62 Merge pull request #49 from grilledham/feature-wells
rewrite of wells
2017-09-03 10:47:13 +02:00
Valansch
ebec501952 Merge branch 'develop' into feature-wells 2017-09-03 10:46:01 +02:00
James Gillham
4e84bdc409 commented out require "rusky_pvp" 2017-09-02 15:14:19 +01:00
James Gillham
aa8d4a246c rewrite of wells 2017-09-02 14:42:37 +01:00
Valansch
a8865205e8 Fixed exception in on_tick after well was removed. #44 2017-09-02 14:58:18 +02:00
Valansch
6e2e9230cb Fixed crashes when command were run from console #43 and implemented console chat #47 2017-09-02 14:31:01 +02:00
James Gillham
41ec0ec911 implemented rusky-pvp 2017-09-02 10:09:42 +01:00
Valansch
9d2dfe81ea Merge pull request #46 from grilledham/develop-manhattan
Develop manhattan
2017-08-30 12:41:05 +02:00
James Gillham
4be27b8cc1 commented lines 2017-08-29 10:31:37 +01:00
James Gillham
05a0d9d049 updates to manhattan map 2017-08-29 10:28:45 +01:00
James Gillham
ca779cf0c3 changed data 2017-08-28 17:31:17 +01:00
James Gillham
b246d4768c manhattan preset 2017-08-28 12:26:35 +01:00
Valansch
722585dd07 Merge pull request #45 from grilledham/new-presets
New presets
2017-08-28 09:44:06 +02:00
Valansch
e70aa33013 Merge branch 'develop' into new-presets 2017-08-28 09:31:17 +02:00
James Gillham
ed4e98dd9d removed test presets 2017-08-28 08:15:41 +01:00