Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,339 Commits 4 Branches 180 Tags
6871db7155277e37ab86a9cb903e4c4954185653
Commit Graph

6339 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
AmateurPotion
d43b40fab5 Update bundle_ko.properties (#1262) 2019-12-28 11:21:55 -05:00
Anuken
c250b1d24a Fixes 2019-12-28 11:16:35 -05:00
Anuken
186a2aaa45 Merge branches 'master' and 'mech-rework' of https://github.com/Anuken/Mindustry into mech-rework 
# 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/ai/BlockIndexer.java
#	core/src/mindustry/core/World.java
#	core/src/mindustry/entities/traits/Entity.java
#	core/src/mindustry/entities/type/BaseEntity.java
#	core/src/mindustry/entities/type/TileEntity.java
#	core/src/mindustry/world/blocks/defense/MendProjector.java
#	core/src/mindustry/world/blocks/defense/OverdriveProjector.java
#	core/src/mindustry/world/blocks/production/Drill.java
#	gradle.properties
 2019-12-27 01:41:06 -05:00
Anuken
c0c0ffa682 Bugfixes 2019-12-27 01:22:50 -05:00
Anuken
98f8a1732e Renamed Calls -> Call 2019-12-26 23:00:26 -05:00
Anuken
d6d6dc29dc More plugin customization / Renamed Rectangle 2019-12-26 22:44:15 -05:00
Anuken
6080a7e4bc Possibly fixed tests / Added support for mod icons 2019-12-26 20:53:53 -05:00
Anuken
c339a0ecdf Merge 2019-12-26 20:44:05 -05:00
Anuken
684f3075cb Team#toString() 2019-12-26 20:20:12 -05:00
Anuken
954e26fc14 Method cleanup 2019-12-26 20:08:53 -05:00
Anuken
c449302d28 Fixed tests 2019-12-26 19:57:24 -05:00
Anuken
d8629100db Functionality fixes 2019-12-26 19:48:45 -05:00
Anuken
4858e602ed Fixed compilation 2019-12-26 19:40:54 -05:00
Anuken
de5979f4ee Many various internal changes 2019-12-26 17:46:01 -05:00
Anuken
36ec88e2e2 Team cleanup 2019-12-26 14:20:36 -05:00
Anuken
a5978b6163 Updated Arc 2019-12-26 08:08:16 -05:00
Anuken
1d6f769e3d Debug fixes 2019-12-26 08:01:24 -05:00
Anuken
2b22b7e7e4 Condensed unit group array 2019-12-25 22:26:51 -05:00
Anuken
9016c12d16 Made team a separate class 2019-12-25 19:07:04 -05:00
Anuken
8ac0949ddf Added default liquid turret liquid display 2019-12-25 14:38:43 -05:00
Anuken
c307fc02cf Full merge 2019-12-25 13:34:27 -05:00
Anuken
c681cc5cf8 Compile fixes 2019-12-25 13:25:44 -05:00
Anuken
1e7c83f0c9 Partial merge 2019-12-25 13:22:36 -05:00
Anuken
fad94cb56e Updated Arc 2019-12-25 12:57:00 -05:00
Anuken
ee429ef4f2 Merge branches 'kill-packages' and 'master' of https://github.com/Anuken/Mindustry 2019-12-25 12:55:38 -05:00
Anuken
c7ea4e85c9 Serialize fixes 2019-12-25 12:47:14 -05:00
Anuken
c0f14185a8 More fixes 2019-12-25 12:35:23 -05:00
Anuken
ec4c2c7adb Fixed compilation 2019-12-25 12:22:12 -05:00
Anuken
03342dc2f5 Android fixes 2019-12-25 12:06:19 -05:00
Anuken
475794640d More cleanup 2019-12-25 11:16:54 -05:00
Anuken
514d4817c8 it is done 2019-12-25 01:39:38 -05:00
Anuken
48daf12810 three dee 2019-12-24 21:45:53 -05:00
Anuken
32d28a4070 Merge branches '6.0' and 'master' of https://github.com/Anuken/Mindustry into 6.0 
# Conflicts:
#	core/assets/sprites/block_colors.png
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/sprites/sprites2.png
#	core/assets/sprites/sprites3.png
#	core/assets/sprites/sprites5.png
#	core/src/io/anuke/mindustry/ctype/ContentType.java
#	core/src/io/anuke/mindustry/ctype/UnlockableContent.java
#	core/src/io/anuke/mindustry/io/LegacyMapIO.java
#	core/src/io/anuke/mindustry/type/WeatherEvent.java
#	gradle.properties
 2019-12-24 12:40:23 -05:00
Patrick 'Quezler' Mounier
f89af1b26a Override inverted sorter arrow colours (#1252) 
Override hex’s of the arrows by those of the unloader.
 2019-12-24 00:32:04 -05:00
TsjipTsjip
49bd91681d Merge pull request #2 from Quezler/bird-liquid-void 
〃but for the right target branch
 2019-12-23 19:58:48 +01:00
Patrick 'Quezler' Mounier
c279fda5e4 Suggest liquid void sprite 
Uses the color of the corner(s) for the inner ring, just like how the item void is colored based on the item source.
 2019-12-23 17:24:38 +01:00
TsjipTsjip
ff3165f5d2 Formatting 2019-12-23 11:35:12 +01:00
Anuken
5b21873f3c Merge remote-tracking branch 'origin/master' 2019-12-22 22:05:00 -05:00
Anuken
b806a22a0a Fixed #1237 2019-12-22 22:04:41 -05:00
Ali-C-Ila
41e4187193 Added Chinese translator (#1250) 2019-12-22 12:01:41 -05:00
Ali-C-Ila
ba7cf94a6b Update bundle_zh_TW.properties (#1211) 
* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties
 2019-12-22 12:01:27 -05:00
Vanguard
01de18b663 RU updates (#1225) 
* 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
 2019-12-22 12:01:03 -05:00
Wina
9aeccfd9f3 Spanish Translation for Google Play Store (#1228) 
* [WIP]Added ES description for play store.

.

* Create short_description.txt

* Create summary.txt

* Update summary.txt

* Create title.txt

* Create video.txt

* Create 100.1.txt
 2019-12-22 11:21:25 -05:00
Wina
41a5c4daf3 Updated Spanish translation (#1227) 
Translated a few items more and fixed gramatical mistakes of the old translation.
 2019-12-22 11:20:59 -05:00
stuffyAI
07e58dc14b Update german language bundle (#1226) 
Mostly adding new things to translate from last few updates, also some missing stuff
 2019-12-22 11:13:38 -05:00
Anuken
ede002878e problem solved 2019-12-21 21:11:30 -08:00
Anuken
9906821912 Update BundleLauncher.java 2019-12-20 20:31:07 -08:00
Anuken
adb12dcbb8 Bugfix 2019-12-19 21:58:43 -05:00
Anuken
7a1f467f27 obligatory daily commit 2019-12-19 21:49:40 -05:00
ado1928
5e568eac0d Added Feathub to the "About" tab (#1234) 
* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Update Links.java
 2019-12-19 19:33:24 -05:00