Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,890 Commits 4 Branches 180 Tags
2dd95a62cab0ff8bf0cfe1f79b046cbcc802274d
Commit Graph

5890 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Joshua Fan
0f6cd5242c Fix chat scroll (#1236) 2019-12-19 19:23:32 -05:00
Anuken
e91151213a Extra mod fields 2019-12-18 09:27:24 -05:00
Anuken
8b4c266d49 Bugfixes 2019-12-18 08:43:31 -05:00
Anuken
1c816be5ce Fixed crash occuring with block overload 2019-12-17 18:15:24 -05:00
Anuken
f504dd2b5a Minor tweaks v101.1 2019-12-17 17:10:29 -05:00
Anuken
26881fbdb9 Added server mod error check 2019-12-17 10:58:43 -05:00
Anuken
8d921199fb Merge remote-tracking branch 'origin/master' 2019-12-16 18:37:18 -05:00
Anuken
4ffe233321 Added repair point range display 2019-12-16 18:37:11 -05:00
Anuken
e076de9dcd Merge pull request #1221 from TsjipTsjip/typoFixes 
'arilleryPlastic' -> 'artilleryPlastic'
 2019-12-16 13:58:59 -05:00
TsjipTsjip
5ce66b0dbb 'arilleryPlastic' -> 'artilleryPlastic' 2019-12-16 19:55:10 +01:00
Anuken
6971a76c8e І 2019-12-16 12:50:18 -05:00
Anuken
d47f86cc21 Cleanup 2019-12-16 10:12:39 -05:00
Anuken
487607e1d6 Removed references to GWT completely 2019-12-16 00:08:14 -05:00
Anuken
3cefc085bd Tentative RU bundle changes 2019-12-15 22:11:07 -05:00
Anuken
3d8e5bd36a Added new Cyrillic font 2019-12-15 21:31:55 -05:00
Anuken
e9ed0512f7 Removed Path API usage 2019-12-15 21:12:41 -05:00
Anuken
0cf39bf5c3 Eliminated 8 characters 2019-12-15 20:01:06 -05:00
Anuken
95a1474b9a Merge remote-tracking branch 'origin/master' 2019-12-15 19:36:38 -05:00
Anuken
53aedcee2c Cleanup 2019-12-15 19:35:04 -05:00
Anuken
9758a05002 Merge pull request #1218 from joshuaptfan/break-cancel 
Prevent right-click from deconstructing when schematic is selected
 2019-12-15 18:38:08 -05:00
joshuaptfan
18bb7ba936 Prevent right-click from deconstructing when schematic is selected; allow deconstruct cancel with left-click 2019-12-15 14:26:13 -08:00
Anuken
9f3dcdf727 Fixed #1215 - made all valid floors show up in drill mine list 2019-12-15 16:29:11 -05:00
Anuken
7d2354a653 Mod path resolving fixes 2019-12-15 16:00:50 -05:00