Anuken/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2024-09-22 22:07:31 +03:00
Code Issues Projects Releases Wiki Activity
7,033 Commits 4 Branches 160 Tags 2.1 GiB
09e08a474b
Commit Graph

2897 Commits

Author SHA1 Message Date
Anuken
09e08a474b Plastanium conveyor + bugfixes 2020-04-24 20:17:24 -04:00
Anuken
21946cafd1 Merge branch 'crater' of https://github.com/Quezler/Mindustry into Quezler-crater 2020-04-24 15:46:32 -04:00
Anuken
6041e238a6 Bugfixes 2020-04-24 12:01:08 -04:00
Anuken
5d4ca753a7 Light cleanup 2020-04-24 11:08:02 -04:00
Anuken
1b2e10d355 Cleanup, re-implementations 2020-04-24 11:01:17 -04:00
Patrick 'Quezler' Mounier
cf186e0219
Merge branch 'master' into crater 
# Conflicts:
#	core/assets/sprites/sprites2.png
 2020-04-23 21:15:11 +02:00
Patrick 'Quezler' Mounier
39266d23c8
Merge branch 'master' into crater 
# Conflicts:
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/sprites/sprites2.png
#	core/assets/sprites/sprites3.png
 2020-04-23 21:10:48 +02:00
Anuken
cafd076f9c Fixed water animation conflict 2020-04-23 15:08:32 -04:00
Anuken
87ed405916 Bugfixes 2020-04-23 14:50:30 -04:00
Anuken
7091cad704 Merge branches '6.0' and 'master' of https://github.com/Anuken/Mindustry into 6.0 2020-04-23 14:05:09 -04:00
Anuken
cec5c24d69 progress 2020-04-23 13:58:06 -04:00
laohuaji233
37240478b8
Update bundle_zh_CN.properties (#1900) 
* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties
 2020-04-23 11:08:33 -04:00
Álvaro Manzanas
cf69fa1d7c
Update bundle_es.properties (#1899) 
* Update bundle_es.properties

* Update bundle_es.properties
 2020-04-22 16:20:07 -04:00
Kaio Duarte Costa
390b5e3b60
Update bundle_pt_BR.properties (#1881) 2020-04-21 11:03:25 -04:00
sk7725
05cfe7a80a
Fixed inconsistencies with the word 'schematic' (#1892) 
설계도 and 회로도 are both schematic.
 2020-04-21 11:03:09 -04:00
Patrick 'Quezler' Mounier
32e32ecae2
Merge branch '6.0' into crater 
# Conflicts:
#	core/assets/icons/icons.properties
#	core/assets/sprites/block_colors.png
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/sprites/sprites2.png
#	core/assets/sprites/sprites4.png
#	core/assets/sprites/sprites6.png
 2020-04-16 22:38:51 +02:00
Anuken
280f3dd428 Added experimental package 2020-04-16 16:31:43 -04:00
Patrick 'Quezler' Mounier
1acc6461e6
Grow the circle slightly inward 2020-04-16 22:05:55 +02:00
Patrick 'Quezler' Mounier
9864383300
Revert 〃 2020-04-16 21:15:49 +02:00
Patrick 'Quezler' Mounier
41eb51a340
Experiment with visible ports 2020-04-16 21:11:59 +02:00
Patrick 'Quezler' Mounier
79a095faa8
Merge branch '6.0' into crater 2020-04-16 20:30:13 +02:00
Patrick 'Quezler' Mounier
a05f4338c5
Waspify the crater 🐝 2020-04-16 20:24:07 +02:00
Anuken
2693f9c176 Implemented some PR features 2020-04-16 13:46:45 -04:00
Corby
15750b5eb0
Korean localization fixes and changes. (#1874) 2020-04-16 13:33:38 -04:00
Patrick 'Quezler' Mounier
589d4c92d1
Scale crater from 16x16 to 20x20 2020-04-16 18:39:24 +02:00
Patrick 'Quezler' Mounier
83511368f6
Stash shadow draft 2020-04-16 17:44:43 +02:00
Patrick 'Quezler' Mounier
a1d4804fae
Merge branch '6.0' into crater 
# 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/sprites4.png
#	core/assets/sprites/sprites6.png
#	core/src/mindustry/ui/fragments/PlayerListFragment.java
 2020-04-16 17:13:18 +02:00
Anuken
a8f4df8030 Merge branches '6.0' and 'master' of https://github.com/Anuken/Mindustry into 6.0 
# Conflicts:
#	core/src/mindustry/ui/fragments/PlayerListFragment.java
 2020-04-16 10:14:13 -04:00
Anuken
256f805754 Payload fixes 2020-04-16 09:55:57 -04:00
Ali-C-Ila
7d6e8fdcd1
Update bundle_zh_TW.properties (#1876) 
* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties
 2020-04-16 09:14:36 -04:00
Patrick 'Quezler' Mounier
5c28985ee6
Merge branch '6.0' into crater 
# Conflicts:
#	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/Blocks.java
#	core/src/mindustry/ui/fragments/PlayerListFragment.java
#	core/src/mindustry/world/BlockStorage.java
 2020-04-16 12:39:52 +02:00
Patrick 'Quezler' Mounier
424e58ff7d
Merge branch 'master' into crater 2020-04-16 11:20:16 +02:00
Anuken
0eaf9bc9c6 Various prototypes 2020-04-15 12:44:53 -04:00
Prosta4okua
305632c002
Update bundle_uk_UA.properties (#1871) 2020-04-15 10:36:38 -04:00
Vanguard
18e92f5abf
RU updates (#1866) 
* Update bundle_ru.properties

* Felix alive (phantom description)

* RU bundle Phantom description fix

* 2 lines changed

wave.enemies
wave.enemy

* 6 lines changed

editor.overwrite.confirm
confirmban
confirmkick
confirmvotekick
confirmadmin
confirmunadmin

Co-authored-by: Prosta4okua <31485341+Prosta4okua@users.noreply.github.com>
Co-authored-by: Felix Corvus <remint32@yandex.ru>
 2020-04-14 10:04:29 -04:00
Miguel de Dios Matias
a10235d6b0
I18n es tiny fix (#1865) 
* Update some translations into spanish.

* Need a white space between #wave_number and wave word (in spanish).

* Added translation for 'search'.

* Fix translate of 'bleeding edge' is https://www.urbandictionary.com/define.php?term=Bleeding%20edge . It is not a name.

* Fixed some spanish strings about schematic.

* Fixed some translations in spanish.
 2020-04-14 10:04:13 -04:00
GioIacca9
25bc6ebaf0
Minor changes (#1858) 2020-04-13 21:22:49 -04:00
Wina
9a0292268e
Minor changes in bundle_es.properties (#1861) 
Added some clarifications in the tutorial and corrected multiple spelling and grammar errors.
 2020-04-13 21:21:20 -04:00
Lapis
91f9ce3098
update (#1862) 2020-04-13 21:21:10 -04:00
Anuken
c717084cb9 Cleanup 2020-04-13 18:07:00 -04:00
Anuken
2af12a632a Added basic multi-unit factories 2020-04-13 16:56:33 -04:00
Olexandr Nesterenko
474ddcf989
Update bundle_uk_UA.properties (#1811) 2020-04-12 18:06:09 -04:00
Fernando
8093f69b6a
Update bundle_pt_BR.properties (#1839) 
* Update bundle_pt_BR.properties

* Update bundle_pt_BR.properties

* Update bundle_pt_BR.properties

* Update bundle_pt_BR.properties
 2020-04-12 17:43:51 -04:00
Lapis
bc20967262
Update bundle_ja.properties (#1848) 
* update

* update

* update
 2020-04-12 13:36:01 -04:00
Blockzilla101
501253d13a
added name of player to ban/kick/vote-kick/un-admin/admin confirmation dialog (#1846) 
* added name of player to baning/kicking/vote-kicking/admining

* slight tweaks

* fixed redundant things
 2020-04-12 10:52:05 -04:00
Anuken
603d8b16d0 Various tweaks 2020-04-12 10:26:18 -04:00
Patrick 'Quezler' Mounier
9e811be477
Name which map name has a conflict when importing (#1844) 2020-04-12 09:56:36 -04:00
Anuken
b1f32d241b Merge branches '6.0' and 'master' of https://github.com/Anuken/Mindustry into 6.0 
# Conflicts:
#	core/assets/bundles/bundle_uk_UA.properties
#	core/src/mindustry/core/NetClient.java
#	core/src/mindustry/ui/fragments/PlayerListFragment.java
#	core/src/mindustry/world/blocks/power/ImpactReactor.java
#	gradle.properties
 2020-04-11 10:37:52 -04:00
Petr Gašparík
9c1730685c
Czech translation - up to date (#1836) 2020-04-10 18:45:01 -04:00
Anuken
67a084a5e7 Cleanup 2020-04-10 13:49:36 -04:00