61197fe974
Remove duplicate code between first & take
2020-01-28 11:08:40 +01:00
89d143af8f
Undo part of 〃
2020-01-28 11:00:08 +01:00
0f92f77b55
Draw crater unto plastanium conveyor icon
...
And remove whitespaces from the emoji one.
2020-01-28 10:57:51 +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
af83d08fb1
FIx inconsistencies in the diff
2020-01-28 07:59:11 +01:00
28765ef909
Merge branch 'master' into crater
2020-01-28 07:45:03 +01:00
89e1c5afc0
Conveyor tweaks
2020-01-28 00:21:05 -05:00
a2933e030a
More severe votekick
2020-01-27 15:43:17 -05:00
8edcebd3a6
Undo moving other bundle keys into their place
...
Should be a different commit/pull
2020-01-27 19:42:27 +01:00
6eb6870bb6
Register crater emoji via ui folder
...
#1458
2020-01-27 19:33:36 +01:00
038fc72d7b
Merge branch 'master' into crater
2020-01-27 19:17:22 +01:00
5ad0193a86
Fixed reduced conveyor edge throughput
2020-01-27 13:15:12 -05:00
883a2a9b59
Bruteforce crater emoji
2020-01-27 18:40:40 +01:00
9a289c83e6
Fuse with conveyor optimization
...
# Conflicts:
# core/src/mindustry/world/blocks/distribution/ItemConveyor.java
2020-01-27 18:06:48 +01:00
65211a6021
Fixed #1447
2020-01-27 11:01:48 -05:00
b7e1adb8b1
Fixed 103 network compatibility
2020-01-27 10:19:18 -05:00
b9e8694e68
Added synced server label + effect methods
2020-01-27 00:25:32 -05:00
cd1ed97e52
Merge branch 'master' of https://github.com/Anuken/Mindustry
2020-01-27 00:11:24 -05:00
a61234d21e
Minor tweaks
2020-01-26 21:50:55 -05:00
9499b9dfaf
Add custom text on screen ( #1448 )
2020-01-26 17:56:11 -05:00
9baaacc8ac
Crash fix
2020-01-26 16:55:24 -05:00
621233a5b3
More optimization
2020-01-26 16:12:11 -05:00
9a3245c23e
Clamp
2020-01-26 15:13:55 -05:00
6fe2697185
2x faster conveyor optimization
2020-01-26 15:04:00 -05:00
adbfb15932
Cleanup
2020-01-26 13:13:01 -05:00
93cada6a16
Conveyor benchmark test
2020-01-26 11:40:09 -05:00
0d5dd146ef
Fixed #1451
2020-01-26 10:58:14 -05:00
1207fb1440
Update bundle_it.properties ( #1431 )
2020-01-25 17:51:43 -05:00
8584fae07a
Czech translation - update ( #1432 )
2020-01-25 17:51:32 -05:00
0a661766be
Update bundle_zh_TW.properties ( #1438 )
2020-01-25 17:51:24 -05:00
fb6cb4829f
Update bundle_uk_UA.properties ( #1434 )
...
* Update bundle_uk_UA.properties
* Update bundle_uk_UA.properties
* Update bundle_uk_UA.properties
* Update bundle_uk_UA.properties
* Update bundle_uk_UA.properties
* Update bundle_uk_UA.properties
* Update bundle_uk_UA.properties
2020-01-25 17:51:17 -05:00
e14a36a97e
Fixed #1445
2020-01-25 17:50:59 -05:00
ca69aafd11
Fixed #1440
2020-01-25 10:44:46 -05:00
923d576a5f
Fixed #1436 / Fixed crawlers not exploding
2020-01-24 23:21:23 -05:00
69711151a5
Bugfixes
2020-01-24 18:48:26 -05:00
aefc4ed83c
Better annotation processing
2020-01-24 18:31:54 -05:00
83f44abb5a
Suppress d/c messages when necessary
2020-01-24 14:27:23 -05:00
6e970cb84d
Fix tech tree entry
2020-01-24 20:26:49 +01: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
f2bc3e78d7
Fixed #1429
2020-01-24 14:00:06 -05:00
2fe6a3525b
Added null check for attribute
2020-01-24 13:37:23 -05:00
78fb427120
Minor fixes
2020-01-24 13:02:03 -05:00
b9876e267b
Headless load fix
2020-01-24 12:31:34 -05:00
4c1459c47e
Fixed page limits in /help
2020-01-24 11:50:51 -05:00
5b9b684ccd
PRE 103 RU_updates ( #1425 )
...
* 1 changed line, 1 removed line
Changed:
keybind.zoom.name
Removed:
keybind.zoom_hold.name
Moved some lines around to keep them in the same order with bundle.properties
* 1 changed line
tutorial.intro
* 3 new lines, 3 changed lines
New:
mod.erroredcontent
mod.errors
mod.noerrorplay
Changed:
mod.requiresversion
mod.remove.confirm
details
* 2 changed lines
mods.guide
mod.import.github
* 1 new line
link.feathub.description
* 1 changed line
item.graphite.description
* 1 changed line
block.mass-driver.description
* 9 new lines, 1 changed line
New:
be.update
be.update.confirm
be.updating
be.ignore
be.noupdates
be.check
server.kicked.serverRestarting
setting.coreselect.name
rules.blockhealthmultiplier
Changed:
wave.enemy
* 3 changed lines
quit.confirm.tutorial
setting.coreselect.name
public.confirm
* 22 changed lines
mod.missing
item.plastanium.name
block.plastanium-wall.name
block.plastanium-wall-large.name
block.plastanium-compressor.name
item.scrap.description
item.spore-pod.description
item.blast-compound.description
liquid.oil.description
unit.revenant.description
block.multi-press.description
block.plastanium-compressor.description
block.spore-press.description
block.power-source.description
block.force-projector.description
block.conveyor.description
block.mass-driver.description
block.liquid-junction.description
block.phase-conduit.description
block.thorium-reactor.description
block.blast-drill.description
block.cyclone.description
* 3 new lines, 2 removed lines
New:
setting.bridgeopacity.name
block.liquid-void.name
block.liquid-void.description
Removed:
block.signal
block.editsignal
* 1 new line
data.openfolder
* 1 changed line
block.cryofluidmixer.description
* 2 new lines
block.underflow-gate.name
block.underflow-gate.description
* 2 changed lines
unit.thousands
unit.millions
* 3 new lines
blocks.tiles
blocks.affinities
setting.playerlimit.name
* 1 changed line
block.underflow-gate.name
* 1 changed line
unit.thousands
* 1 changed line
blocks.affinities
* 1 changed line (reverted)
unit.thousands
Co-authored-by: Anuken <arnukren@gmail.com >
2020-01-24 11:31:14 -05:00
8141361a30
Fix script whitelist
2020-01-24 11:27:47 -05:00
99e51411d5
Implemented #1048
2020-01-24 11:24:35 -05:00
4ca1a506b6
Merge remote-tracking branch 'origin/master'
2020-01-24 11:17:22 -05:00
125d6ef8cd
Cleanup
2020-01-24 11:17:18 -05:00
76d425a920
Czech translation for Android and Steam + continuous updates ( #1383 )
...
* Improving Czech translation, up to line 374 now
* Czech translation, revisited up to line 468
* Translation revision up to line 510.
* Czech translation - small fixes here and there.
* Czech translation - small fixes here and there.
* Czech lang. - Fixed some typos found by @dusekdan
* Czech - revision up to line 564
* Czech tr. - small fixes to fit into GUI
* Czech tr. - small fixes after checking GUI
* Czech tr. - revision up to line 670 done
* Czech tr. - revisited up to line 748.
* Czech tr. - now it has the same length as English
* Czech translation - polished up to line 1062
Only tutorial left...
* Czech translation - small fixes
* Czech tr. - revisited up to line 1070
* Czech translation - revision done up line 1084.
New: tutorial translated, new key incorporated.
* Czech translation done up to line 1100.
* Czech translation up to line 1105
* Czech translation - small corrections, consistency
* Czech translation up to line 1124
* Czech translation - done up to line 1159
* Czech translation up to line 1071
* Czech translation, up to line 1177
* Czech translation, done up to line 1203
* Czech translation REVISION DONE!
* Czech files for Steam!
* Czech - full translation for Android
* Czech translation - fixing typos found by @dusekdan
thank you!
* Czech traslation, back to "Workshop" from "Dílna"
...as it is the same name on Steam
* Czech translation - underflow gate
2020-01-24 11:12:41 -05:00
