Patrick 'Quezler' Mounier
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
Patrick 'Quezler' Mounier
af83d08fb1
FIx inconsistencies in the diff
2020-01-28 07:59:11 +01:00
Patrick 'Quezler' Mounier
28765ef909
Merge branch 'master' into crater
2020-01-28 07:45:03 +01:00
Anuken
89e1c5afc0
Conveyor tweaks
2020-01-28 00:21:05 -05:00
Anuken
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
Anuken
a2933e030a
More severe votekick
2020-01-27 15:43:17 -05:00
Patrick 'Quezler' Mounier
8edcebd3a6
Undo moving other bundle keys into their place
...
Should be a different commit/pull
2020-01-27 19:42:27 +01:00
Patrick 'Quezler' Mounier
6eb6870bb6
Register crater emoji via ui folder
...
#1458
2020-01-27 19:33:36 +01:00
Patrick 'Quezler' Mounier
038fc72d7b
Merge branch 'master' into crater
2020-01-27 19:17:22 +01:00
Anuken
5ad0193a86
Fixed reduced conveyor edge throughput
2020-01-27 13:15:12 -05:00
Patrick 'Quezler' Mounier
883a2a9b59
Bruteforce crater emoji
2020-01-27 18:40:40 +01:00
Patrick 'Quezler' Mounier
9a289c83e6
Fuse with conveyor optimization
...
# Conflicts:
# core/src/mindustry/world/blocks/distribution/ItemConveyor.java
2020-01-27 18:06:48 +01:00
Anuken
65211a6021
Fixed #1447
2020-01-27 11:01:48 -05:00
Anuken
b7e1adb8b1
Fixed 103 network compatibility
2020-01-27 10:19:18 -05:00
Vanguard and GitHub
d1c2666fdd
1 changed line (new approach)
...
techtree
2020-01-27 16:11:23 +03:00
Petr Gašparík
69069e2ef3
Czech translation - mod display
2020-01-27 11:32:31 +01:00
Anuken
b9e8694e68
Added synced server label + effect methods
2020-01-27 00:25:32 -05:00
Anuken
cd1ed97e52
Merge branch 'master' of https://github.com/Anuken/Mindustry
2020-01-27 00:11:24 -05:00
Anuken
a61234d21e
Minor tweaks
2020-01-26 21:50:55 -05:00
키에르 and Anuken
9499b9dfaf
Add custom text on screen ( #1448 )
2020-01-26 17:56:11 -05:00
Anuken
9baaacc8ac
Crash fix
2020-01-26 16:55:24 -05:00
Anuken
621233a5b3
More optimization
2020-01-26 16:12:11 -05:00
Anuken
9a3245c23e
Clamp
2020-01-26 15:13:55 -05:00
Anuken
6fe2697185
2x faster conveyor optimization
2020-01-26 15:04:00 -05:00
Anuken
adbfb15932
Cleanup
2020-01-26 13:13:01 -05:00
Anuken
93cada6a16
Conveyor benchmark test
2020-01-26 11:40:09 -05:00
Anuken
0d5dd146ef
Fixed #1451
2020-01-26 10:58:14 -05:00
Nickibosss and Anuken
1207fb1440
Update bundle_it.properties ( #1431 )
2020-01-25 17:51:43 -05:00
Petr Gašparík and Anuken
8584fae07a
Czech translation - update ( #1432 )
2020-01-25 17:51:32 -05:00
Ali-C-Ila and Anuken
0a661766be
Update bundle_zh_TW.properties ( #1438 )
2020-01-25 17:51:24 -05:00
Prosta4okua and Anuken
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
Anuken
e14a36a97e
Fixed #1445
2020-01-25 17:50:59 -05:00
Anuken
ca69aafd11
Fixed #1440
2020-01-25 10:44:46 -05:00
Vanguard and GitHub
df3a62b87c
Merge branch 'master' into master
2020-01-25 15:03:05 +03:00
Vanguard and GitHub
65e2a32722
1 changed line
...
techtree
2020-01-25 14:57:51 +03:00
Anuken
923d576a5f
Fixed #1436 / Fixed crawlers not exploding
2020-01-24 23:21:23 -05:00
Vanguard and GitHub
0103a2b7c6
1 new line
...
mod.display
2020-01-25 04:05:03 +03:00
Prosta4okua and GitHub
095cb68725
Update bundle_ru.properties
2020-01-25 02:12:21 +02:00
Anuken
69711151a5
Bugfixes
2020-01-24 18:48:26 -05:00
Anuken
aefc4ed83c
Better annotation processing
2020-01-24 18:31:54 -05:00
Anuken
83f44abb5a
Suppress d/c messages when necessary
2020-01-24 14:27:23 -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
f2bc3e78d7
Fixed #1429
2020-01-24 14:00:06 -05:00
Anuken
2fe6a3525b
Added null check for attribute
2020-01-24 13:37:23 -05:00
Anuken
78fb427120
Minor fixes
2020-01-24 13:02:03 -05:00
Anuken
b9876e267b
Headless load fix
2020-01-24 12:31:34 -05:00
Anuken
4c1459c47e
Fixed page limits in /help
2020-01-24 11:50:51 -05:00
Vanguard and Anuken
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
Vanguard and GitHub
5c0f24aa41
1 changed line (reverted)
...
unit.thousands
2020-01-24 19:31:05 +03:00
Patrick 'Quezler' Mounier
Anuken
VanguardandGitHub
Petr Gašparík
키에르andAnuken
NickibosssandAnuken
Ali-C-IlaandAnuken
Prosta4okuaandAnuken