Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,303 Commits 4 Branches 180 Tags
e8eecf8a1fa4a5ca1663447df31b4f80dc7cce7b
Commit Graph

6249 Commits

Author SHA1 Message Date
Prosta4okua
d7eb0d3ba3 Update bundle_uk_UA.properties 2020-02-08 12:23:50 +02:00
Anuken
659bfea8cf Cleanup 2020-02-07 23:12:39 -05:00
Anuken
c8455ddbc8 Added message for non-building units 2020-02-07 21:56:55 -05:00
Anuken
3a2fef3bd7 Merge remote-tracking branch 'origin/master' 2020-02-07 20:52:03 -05:00
Anuken
9ccf95971e Fixed small launch items button 2020-02-07 20:51:59 -05:00
valtsu41
9b36125b0c Finnish translation & grammar update (#1473) 
* Finnish translation & grammar update

* More grammar correcting and making things more native

* Just a little more fine-tuning

* Fixes
 2020-02-07 20:42:14 -05:00
Anuken
0ffcd0b94c Fixed #1507 / Fixed #1504 2020-02-07 20:21:45 -05:00
Anuken
5a5945cc52 Merge remote-tracking branch 'origin/master' 2020-02-07 20:09:45 -05:00
Anuken
e5fd3dec4c Fixed #1526 2020-02-07 20:09:37 -05:00
Anuken
8a9c92227d More movement 2020-02-07 18:55:53 -05:00
Anuken
4265d40024 Movement 2020-02-07 13:02:24 -05:00
Anuken
861b3ac3f4 Tweaks 2020-02-07 11:46:10 -05:00
Anuken
007a1bd1d2 Unit definitions 2020-02-07 11:04:58 -05:00
Anuken
b9841f9cfa a mess 2020-02-07 10:47:58 -05:00
Anuken
33e818a757 Entity name mapping 2020-02-07 09:36:51 -05:00
扩散性百万甜面包
7b586ea043 Fix a typo (#1528) 
* Fix a typo

* Update core/src/mindustry/mod/Mods.java

Co-Authored-By: Patrick 'Quezler' Mounier <Quezler@me.com>

Co-authored-by: Patrick 'Quezler' Mounier <Quezler@me.com>
 2020-02-07 08:25:26 -05:00
Petr Gašparík
e98808bc46 Czech for server categories! 2020-02-07 12:35:09 +01:00
Petr Gašparík
bc37415a10 Merge branch 'master' of https://github.com/Anuken/Mindustry into v103.3 2020-02-07 12:32:33 +01:00
Prosta4okua
619b2ba897 Update bundle_uk_UA.properties 2020-02-07 12:42:59 +02:00
Patrick 'Quezler' Mounier
d7e8a8e4f4 Add comment to 〃 2020-02-07 11:02:42 +01:00
Patrick 'Quezler' Mounier
b66e03d2a8 Revert "Cache upstream" 
This reverts commit 908018b97c.
 2020-02-07 10:59:51 +01:00
Patrick 'Quezler' Mounier
908018b97c Cache upstream 
But i do ¬ like how this turned out, so reverting :(
 2020-02-07 10:59:45 +01:00
Patrick 'Quezler' Mounier
9abb08152b Prettify upsteam calculator 2020-02-07 10:51:36 +01:00
Patrick 'Quezler' Mounier
94dc220924 Finish 〃 2020-02-07 10:32:43 +01:00
Patrick 'Quezler' Mounier
3d8e83850e Refractor inputs to upstream 2020-02-07 08:41:34 +01:00
Anuken
eeae5149a1 Basic unit rendering 2020-02-06 22:08:31 -05:00
Anuken
37a9311202 Merge remote-tracking branch 'origin/master' 2020-02-06 20:25:17 -05:00
Anuken
e9f37ea68e Removed entity processor files 2020-02-06 20:25:10 -05:00
Anuken
f83b6728cf ? 2020-02-06 20:24:30 -05:00
Prosta4okua
59431b223b Update bundle_uk_UA.properties 2020-02-06 23:38:45 +02:00
Anuken
e3136e9e09 more rendering 2020-02-06 14:58:12 -05:00
MEEP of Faith
da5755b7c1 For consistancy (#1517) 
Swap "liquids" with "liquid." Also proposing because the category for liquid blocks is "liquid" and not "liquids" when modding.
 2020-02-06 14:46:33 -05:00
Patrick 'Quezler' Mounier
4147d8a512 Cleanup 〃 2020-02-06 20:23:42 +01:00
Patrick 'Quezler' Mounier
8c7b688f78 Add layered blendbitz 2020-02-06 20:19:00 +01:00
Anuken
ddecb2d831 Actual updating and rendering 2020-02-06 13:40:07 -05:00
Patrick 'Quezler' Mounier
99d1a2829f Merge branch 'master' into crater 2020-02-06 19:33:57 +01:00
Patrick 'Quezler' Mounier
c0d250560a 🐍 is kil 2020-02-06 19:33:42 +01:00
Anuken
6fe5663f79 Autogenerated render layer groups 2020-02-06 13:20:03 -05:00
Anuken
70c06b58ef Conveyor cleanup 2020-02-06 11:38:36 -05:00
Anuken
6a99a3922e Cleanup 2020-02-06 11:37:22 -05:00
Patrick 'Quezler' Mounier
502e8f78ce Move some stuff around 2020-02-06 17:25:54 +01:00
Anuken
a11f6efe0a Rudimentary rendering 2020-02-05 23:04:48 -05:00
Anuken
8172e69f8c it launches 2020-02-05 22:08:57 -05:00
Anuken
dfecfa3964 . 2020-02-05 20:11:49 -05:00
Vanguard
9b30b452a1 3 changed lines 
servers.local
servers.remote
servers.global
 2020-02-06 03:39:32 +03:00
Vanguard
c254a702fc 3 new lines 
servers.local
servers.remote
servers.global
 2020-02-06 03:34:19 +03:00
Anuken
4a2c6c571f Merge remote-tracking branch 'origin/master' 2020-02-05 19:02:02 -05:00
Anuken
a5fd881f8d Full implementation of #1494 2020-02-05 19:01:53 -05:00
martin-mfg
d59b23b835 bundle_de.properties: merge PRs + further improvements (#1482) 
* Update bundle_de.properties

* Update bundle_de.properties

* Update bundle_de.properties

* Update bundle_de.properties

* Update bundle_de.properties

* Update bundle_de.properties

* Update bundle_de.properties

* add minor missing changes from discussion in #799

* fix duplicated text in german translation (configure.locked)

* apply German translation suggestions from PR comment

This commit applies suggestions from the comment at https://github.com/Anuken/Mindustry/pull/783#pullrequestreview-299643677

Co-authored-by: Anuken <arnukren@gmail.com>
Co-authored-by: Silvério Santos <ssantos@web.de>
 2020-02-05 18:37:21 -05:00
Patrick 'Quezler' Mounier
e06d8eabec [formatting] add newline to file(s) (#1508) 
* Trail appropriate files with a new line

* For some ironic reason it ignored itself

Probably because it wasn’t tracked/commited yet.

* Rename newlines to server executable naming pattern
 2020-02-05 18:36:56 -05:00