Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features

Browse Source 
 Conflicts:
	core/src/mindustry/world/blocks/environment/Floor.java
	core/src/mindustry/world/blocks/payloads/Payload.java
	gradle.properties
This commit is contained in:
Anuken
2021-07-15 09:13:35 -04:00
parent 8644844b7d 61d81046ae
commit 103f24d41d
61 changed files with 571 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/assets/bundles/bundle.properties
View File

@@ -101,6 +101,7 @@ customgame = Custom Game
newgame = New Game
none = <none>
none.found = [lightgray]<none found>
none.inmap = [lightgray]<none in map>
minimap = Minimap
position = Position
close = Close
@@ -1596,7 +1597,7 @@ lst.set = Set a variable.
lst.operation = Perform an operation on 1-2 variables.
lst.end = Jump to the top of the instruction stack.
lst.wait = Wait a certain number of seconds.
lst.lookup = Look up a item/liquid/unit/block type by ID.\nTotal counts of each type can be accessed with:\n[accent]@unitCount[] / [accent]@itemCount[] / [accent]@liquidCount[] / [accent]@blockCount[]
lst.lookup = Look up an item/liquid/unit/block type by ID.\nTotal counts of each type can be accessed with:\n[accent]@unitCount[] / [accent]@itemCount[] / [accent]@liquidCount[] / [accent]@blockCount[]
lst.jump = Conditionally jump to another statement.
lst.unitbind = Bind to the next unit of a type, and store it in [accent]@unit[].
lst.unitcontrol = Control the currently bound unit.