Patrick 'Quezler' Mounier
|
5c28985ee6
|
Merge branch '6.0' into crater
# Conflicts:
# core/assets/icons/icons.properties
# core/assets/sprites/block_colors.png
# core/assets/sprites/sprites.atlas
# core/assets/sprites/sprites.png
# core/assets/sprites/sprites3.png
# core/assets/sprites/sprites5.png
# core/src/mindustry/content/Blocks.java
# core/src/mindustry/ui/fragments/PlayerListFragment.java
# core/src/mindustry/world/BlockStorage.java
|
2020-04-16 12:39:52 +02:00 |
|
Anuken
|
2af12a632a
|
Added basic multi-unit factories
|
2020-04-13 16:56:33 -04:00 |
|
Anuken
|
77f406e9b8
|
Fixed core errors
|
2020-03-06 15:22:13 -05:00 |
|
Anuken
|
6d68e10804
|
Bugfixes, cleanup
|
2020-02-16 22:22:10 -05:00 |
|
Patrick 'Quezler' Mounier
|
6e970cb84d
|
Fix tech tree entry
|
2020-01-24 20:26:49 +01:00 |
|
Patrick 'Quezler' Mounier
|
58a79d8631
|
Update to v103
# Conflicts:
# core/assets/sprites/block_colors.png
# core/assets/sprites/sprites.atlas
# core/assets/sprites/sprites.png
# core/assets/sprites/sprites3.png
# core/assets/sprites/sprites5.png
# core/src/mindustry/content/Blocks.java
# core/src/mindustry/content/TechTree.java
# core/src/mindustry/world/blocks/distribution/ItemConveyor.java
|
2020-01-24 20:25:03 +01:00 |
|
Anuken
|
f4940fffab
|
Minor tweaks
|
2020-01-23 18:33:32 -05:00 |
|
Anuken
|
501ca5dd4e
|
New tech tree layout
|
2020-01-20 22:39:46 -05:00 |
|
Anuken
|
200e85d970
|
Added underflow gate to tech tree
|
2020-01-20 18:55:26 -05:00 |
|
Patrick 'Quezler' Mounier
|
ed765ad10a
|
Merge branch 'master' into crater
# Conflicts:
# core/assets/sprites/block_colors.png
# core/assets/sprites/sprites.atlas
# core/assets/sprites/sprites.png
# core/assets/sprites/sprites3.png
# core/assets/sprites/sprites5.png
|
2020-01-10 12:02:07 +01:00 |
|
Anuken
|
50355b45d5
|
Tech tree balance
|
2020-01-08 23:28:25 -05:00 |
|
Patrick 'Quezler' Mounier
|
c3186b63ce
|
Rename compression to plastanium
Breaking change.
|
2020-01-01 13:43:14 +01:00 |
|
Patrick 'Quezler' Mounier
|
8cd03c8a06
|
Add techtree entry
|
2020-01-01 13:34:08 +01:00 |
|
Anuken
|
514d4817c8
|
it is done
|
2019-12-25 01:39:38 -05:00 |
|