1
0
mirror of https://github.com/ComfyFactory/ComfyFactorio.git synced 2025-01-10 00:43:27 +02:00
Commit Graph

864 Commits

Author SHA1 Message Date
hanakocz
ff5c79cfc6
Merge pull request #3 from M3wM3w/master
update from main
2020-02-24 06:39:29 +01:00
hanakocz
f6c9ec8fba
reworking the structure 2020-02-24 00:39:58 +01:00
hanakocz
60d8b70ad8
Add files via upload 2020-02-23 18:33:37 +01:00
hanakocz
ac3b5954ed
fixes 2020-02-23 16:51:07 +01:00
manolck
19c442c77d
Add files via upload 2020-02-23 04:02:58 +01:00
manolck
17def939a6
Update main.lua 2020-02-22 20:51:56 +01:00
manolck
45323c528c
Add files via upload 2020-02-22 17:56:26 +01:00
hanakocz
59a5bf92c4
Win condition added
- final level unlocking starts at jump 15, can be absolutely unlocked at jump 25.
2020-02-21 22:58:14 +01:00
hanakocz
0a76381307
wagons remember filters, tiny cleanup 2020-02-21 06:25:19 +01:00
hanakocz
a7bf8c3f17
New update
- difficulty vote (default is NORMAL!)
- poison upgrade operated by comfylatron 
- can open output wagons directly
- some fixes
2020-02-20 23:19:00 +01:00
MewMew
0a5c2aa938 update
fixed tile placements inside oasis
resource placements redone
biter placements redone
mostly only railways are now placeable in the sands
starter gear redone
2020-02-19 15:24:11 +01:00
hanakocz
2ff8375efd
updates
- lava planet fires happen only when no pavement
- new planet
-if staying for too long, biters on next planets can evolve
2020-02-19 15:15:16 +01:00
hanakocz
fe257962a5
forgot to add 2020-02-18 02:45:37 +01:00
hanakocz
2543abbc72
updates 2020-02-18 02:43:22 +01:00
hanakocz
e0cf887347
new stuff, fixes 2020-02-17 17:37:22 +01:00
hanakocz
8c68f18187
Upgrades, rebalance 2020-02-17 00:46:22 +01:00
MewMew
c7d5dd0a76 terrain tweaks 2020-02-15 16:32:51 +01:00
MewMew
40ab42e023 new map 2020-02-15 15:56:24 +01:00
hanakocz
0eb6a95d69
research fix 2020-02-14 22:02:42 +01:00
hanakocz
ec3d1538c8
Add files via upload 2020-02-14 21:06:52 +01:00
MewMew
61c84fc095 worm turret tier tweak 2020-02-10 18:08:20 +01:00
Masamune
b84eb35633 Merge remote-tracking branch 'upstream/master' into adminLogFixSwitchMutagen 2020-02-08 09:40:56 +01:00
Masamune
864eb97e88 fix for admin log bug which was always going back to mutagen log using dropdown 2020-02-08 09:40:28 +01:00
MewMew
506d3117e2 Merge pull request #137 from Masamune0/fixCrashMutagenLog
Fix crash mutagen log
2020-02-08 09:32:48 +01:00
MewMew
673b6b81bc update
unit spawners are saved in global
biter terrain changes
random attack angles removed
2020-02-08 09:32:10 +01:00
Masamune
e24d8547f5 Merge remote-tracking branch 'upstream/master' into fixCrashMutagenLog 2020-02-07 18:38:44 +01:00
Masamune
314c13e4a7 Update mutagen log : fix crash case 2020-02-07 18:37:36 +01:00
Masamune
a6342ba529 [MUTAGENLOG]Fixed the loop not always doing 7 iterations for all science 2020-02-06 20:40:05 +01:00
MewMew
c0b02ed725 gui + thingies 2020-02-03 10:33:27 +01:00
MewMew
4ce0a40327 progress 2020-02-03 09:57:10 +01:00
MewMew
b8ca5dfa6b new stuff 2020-02-03 08:35:20 +01:00
MewMew
4ea7ac8b1d
Merge pull request #133 from AwesomePatrol/improve-log
Fix feeding message formatting for discord
2020-02-03 07:22:56 +01:00
MewMew
5a87b8e01b
Merge pull request #127 from Masamune0/mutagenLogFilters
Mutagen log filters : bug fix and 3 filters added (force, science, evo jump)
2020-02-03 07:20:26 +01:00
MewMew
713fd5cc9f removal of unused 2020-02-03 07:10:58 +01:00
Aleksander Mistewicz
35ddd5cab3 Use simpler message format for discord 2020-02-02 17:27:57 +01:00
Aleksander Mistewicz
521cde4a6b Post feeding messages to discord 2020-02-02 02:13:35 +01:00
Masamune
958835c8e1 fix for error on heavy mode : frame refresh code update on mutagen log 2020-02-01 23:05:05 +01:00
Aleksander Mistewicz
01664d3b7f Post spectator-related messages to discord 2020-02-01 21:49:12 +01:00
Aleksander Mistewicz
d074ef7189 Post join message when switching forces to discord
When in tournament no messages are sent related to team management.
2020-02-01 21:48:55 +01:00
MewMew
ac91ef02b4
Merge pull request #128 from cogito123/planet_prison_1_1_0
Planet prison 1 1 0
2020-02-01 18:35:51 +01:00
MewMew
fba9c7df81 fix for mirrored entities glitch 2020-02-01 18:34:41 +01:00
Masamune
6e82163c9d Cleaned code 2020-02-01 11:22:44 +01:00
Masamune
7bfe38f69e Made dropdown_sers_choice global to remove desync 2020-02-01 11:15:43 +01:00
Masamune
5b38d03780 Added more loops in mutagen log for easier reading 2020-02-01 10:30:07 +01:00
cogito
2e7b66605d pp: bump to 1.1.0 2020-02-01 10:08:36 +01:00
cogito
4350efa9f6 pp: nerf robot followers count 2020-02-01 10:08:36 +01:00
cogito
42f28dc9e6 pp: balance merchant prices 2020-02-01 10:08:36 +01:00
cogito
9e5012c582 pp: add annihilation ending
Map will be reset, when this happens.
2020-02-01 10:08:36 +01:00
cogito
5ef9052b16 pp: change default player name template
Changes default player name template into something easier to memorize.
2020-02-01 10:08:36 +01:00
cogito
04ceb853dc pp: remove uranium and cliffs 2020-02-01 10:08:36 +01:00