c1e1e3c25b
Merge remote-tracking branch 'origin/master'
2020-05-01 11:23:44 -04:00
e75d1a51a6
More accurate resource display / Server fix
2020-05-01 11:23:36 -04:00
c0e149f5f3
Finetune itemsmoved stat on stack conveyors ( #1954 )
2020-05-01 10:17:14 -04:00
2dbb099d79
AI tweaks / Control tweaks / Plastanium conveyor tweaks / Unit factories
2020-04-30 14:46:22 -04:00
2e2c8ceab4
Bugfixes
2020-04-25 00:04:14 -04:00
09e08a474b
Plastanium conveyor + bugfixes
2020-04-24 20:17:24 -04:00
39266d23c8
Merge branch 'master' into crater
...
# Conflicts:
# core/assets/sprites/sprites.atlas
# core/assets/sprites/sprites.png
# core/assets/sprites/sprites2.png
# core/assets/sprites/sprites3.png
2020-04-23 21:10:48 +02:00
18b68fefed
how did this compile
2020-04-23 00:16:41 -04:00
16a1483f55
Require 4 loading docks to saturate a belt
...
Which encourages using them right from the factory, instead of simply connecting it up to a full titanium belt.
2020-04-18 13:28:32 +02:00
32e32ecae2
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/sprites2.png
# core/assets/sprites/sprites4.png
# core/assets/sprites/sprites6.png
2020-04-16 22:38:51 +02:00
280f3dd428
Added experimental package
2020-04-16 16:31:43 -04:00
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
0eaf9bc9c6
Various prototypes
2020-04-15 12:44:53 -04:00
c717084cb9
Cleanup
2020-04-13 18:07:00 -04:00
2af12a632a
Added basic multi-unit factories
2020-04-13 16:56:33 -04:00
67a084a5e7
Cleanup
2020-04-10 13:49:36 -04:00
85e4270536
New water textures
2020-04-04 00:31:29 -04:00
a26cd46a7e
Reflective planet water
2020-04-02 12:32:55 -04:00
ad45bebbdc
Better spawn selection
2020-03-22 09:28:55 -04:00
08488857da
Removed DoubleTurret, merged functionality
2020-03-17 11:02:10 -04:00
808615a77c
Bugfixes
2020-03-13 22:33:37 -04:00
863c7ae2bc
Removed unit factory limit
2020-03-08 17:49:19 -04:00
7b144cbec6
Attribute tweaks
2020-03-07 13:56:57 -05:00
f8b554aff8
Fixed some basic crashes
2020-03-06 15:30:51 -05:00
4358658889
Down to less than 100 errors
2020-03-06 14:55:06 -05:00
087aef6b85
Move capacity into crater
2020-03-06 11:06:35 +01:00
1c48c1a43e
Cleanup
2020-03-05 23:23:10 -05:00
2e19504b65
it begins
2020-03-05 20:27:42 -05:00
5a0d079a78
oh no
2020-03-05 18:05:59 -05:00
e5e4884448
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
# core/src/mindustry/world/modules/ItemModule.java
2020-03-05 10:00:02 +01:00
baa0eb1149
Added cliffs as separate block
2020-02-21 23:45:25 -05:00
da2cc292c3
Wall generation
2020-02-17 20:33:01 -05:00
6fd0205495
Merge
2020-02-11 19:55:02 -05:00
fb302d49c7
Improved battery brightness display / Palette tweak / Diffgen buff
2020-02-11 17:27:33 -05:00
562fa07755
Merge branch 'master' into crater
2020-02-10 12:09:14 +01:00
a2706a80b1
Merged with master
2020-02-09 12:27:44 -05:00
5169e197b6
Bugfixes
2020-02-08 16:00:54 -05:00
ba1f59aa71
Better physics
2020-02-08 15:39:27 -05:00
da5755b7c1
For consistancy ( #1517 )
...
Swap "liquids" with "liquid." Also proposing because the category for liquid blocks is "liquid" and not "liquids" when modding.
2020-02-06 14:46:33 -05:00
a7b39e56bd
Cleanup continues
2020-02-04 18:00:32 -05:00
be50997f94
Merge branches '6.0' and 'splinterface-impl' of https://github.com/Anuken/Mindustry into splinterface-impl
...
# 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/Vars.java
# core/src/mindustry/entities/traits/SaveTrait.java
# core/src/mindustry/maps/generators/MapGenerator.java
# core/src/mindustry/ui/dialogs/DeployDialog.java
# core/src/mindustry/world/blocks/Floor.java
# desktop/src/mindustry/desktop/DesktopLauncher.java
# gradle.properties
2020-02-04 12:25:18 -05:00
36b9451e01
Read-only component fields / Removed get/set prefix
2020-02-04 12:14:09 -05:00
a942ed2cad
More cleanup
2020-02-03 20:24:49 -05:00
445126ea65
Rename Track to CraterConveyor
...
though it does not extend the conveyor class.
2020-01-28 11:41:20 +01:00
683211cb1f
Untangle conveyor entanglement
...
Made track a standalone block due to the influx of conveyor code changes, and if it were ever to return it would make sense to also include the conduits in one form or another, like a 🐍 class/trait/abstract/method/etc
2020-01-28 10:41:30 +01:00
ad6e0bcd0f
Merge branches 'master' and 'mech-rework' of https://github.com/Anuken/Mindustry into mech-rework
...
# Conflicts:
# android/src/mindustry/android/AndroidLauncher.java
# annotations/src/main/java/mindustry/annotations/SerializeAnnotationProcessor.java
# annotations/src/main/java/mindustry/annotations/impl/AssetsAnnotationProcessor.java
# build.gradle
# core/assets-raw/fontgen/config.json
# core/assets/bundles/bundle_cs.properties
# core/assets/bundles/bundle_it.properties
# core/assets/fonts/font.ttf
# core/assets/fonts/icon.ttf
# 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/UnitTypes.java
# core/src/mindustry/core/NetClient.java
# core/src/mindustry/core/NetServer.java
# core/src/mindustry/entities/bullet/BulletType.java
# core/src/mindustry/entities/type/TileEntity.java
# core/src/mindustry/maps/filters/FilterOption.java
# core/src/mindustry/mod/Scripts.java
# core/src/mindustry/ui/Fonts.java
# core/src/mindustry/ui/dialogs/DeployDialog.java
# core/src/mindustry/ui/fragments/HudFragment.java
# core/src/mindustry/ui/fragments/MenuFragment.java
# core/src/mindustry/world/blocks/production/Cultivator.java
# core/src/mindustry/world/blocks/units/CommandCenter.java
# gradle.properties
# tools/src/mindustry/tools/FontGenerator.java
2020-01-27 15:51:02 -05:00
9a289c83e6
Fuse with conveyor optimization
...
# Conflicts:
# core/src/mindustry/world/blocks/distribution/ItemConveyor.java
2020-01-27 18:06:48 +01:00
0d5dd146ef
Fixed #1451
2020-01-26 10:58:14 -05:00
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
a4e820f907
Added default ore flags for modded ores
2020-01-23 20:20:04 -05:00
