mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-03-15 04:14:07 +07:00
Code Issues Packages Projects Releases Wiki Activity
5,134 Commits 4 Branches 160 Tags 2.3 GiB
6d6fe41bc5
Commit Graph

2151 Commits

Author SHA1 Message Date
Anuken
d0dc21a52c Workshop refactoring 2019-10-19 02:00:43 -04:00
Anuken
f7be953bb5 Schematic import 2019-10-19 01:19:32 -04:00
Anuken
08a51d8f1b Schematic export buttons, workshop support progress 2019-10-19 01:03:49 -04:00
Anuken
88e1770f2e Bugfixes 2019-10-18 19:31:01 -04:00
Anuken
142e93f3e9 Schematic search button 2019-10-18 17:18:29 -04:00
Anuken
f7d98591c9 Schematic rotation 2019-10-18 11:38:00 -04:00
Anuken
44c8b07eb1 Things 2019-10-17 22:14:04 -04:00
Anuken
0095d89543 Merge branch 'master' of https://github.com/Anuken/Mindustry into schematics 2019-10-17 21:58:55 -04:00
Anuken
1921bc87a2 Dialog 2019-10-17 16:53:43 -04:00
Anuken
fd12027873 Merge remote-tracking branch 'origin/master' 2019-10-16 14:37:31 -04:00
Anuken
ff4c7e4302 Multithreaded packing 2019-10-16 14:36:46 -04:00
Anuken
af3067c08b
Merge pull request #800 from laohuaji233/patch-23 
Update bundle_zh_CN.properties
 2019-10-15 18:30:57 -04:00
Anuken
d0006eaa26
Merge pull request #793 from 1RedOne/patch-2 
Adds Japanese menu items for Mods
 2019-10-15 18:21:04 -04:00
Anuken
52b2731a42
Merge pull request #785 from osoitz/patch-2 
Update bundle_eu.properties
 2019-10-15 18:19:11 -04:00
Anuken
08f3368766
Merge pull request #782 from Amon-Senpai/patch-2 
Update bundle_de.properties
 2019-10-15 18:17:30 -04:00
Anuken
86474484ae
Merge pull request #780 from PlayerBrasil13/patch-3 
Update bundle_pt_BR.properties
 2019-10-15 18:17:11 -04:00
Anuken
e31fb13378
Merge pull request #774 from dase1353/patch-1 
Update bundle_zh_TW.properties
 2019-10-15 18:15:44 -04:00
Anuken
c147389d25
Merge pull request #769 from Tunacan427/master 
Huge updates to Turkish translations
 2019-10-15 18:15:12 -04:00
Anuken
e5335e9a97
Merge branch 'master' into master 2019-10-15 18:08:21 -04:00
Anuken
5c0a338e6b
Merge pull request #765 from azureblue/azureblue-patch-1_bundle_pl 
Update bundle_pl.properties
 2019-10-15 18:07:52 -04:00
Anuken
73329ccaf2
Merge pull request #753 from clfer/feature/update_bundle_fr_FR 
Update bundle_fr.properties
 2019-10-15 18:05:09 -04:00
DeltaRays
bfe57b309a Update bundle_it.properties (#740) 2019-10-15 17:53:50 -04:00
eru_java
6715c43fc3 Update bundle_ja.properties (Steam Translate and Update) (#736) 
Translated STEAM.
Translated new features.
 2019-10-15 17:53:03 -04:00
Mengyang Li
f68348bde6 Update bundle_zh_CN.properties: fix minor typo (#725) 2019-10-15 17:47:00 -04:00
Charlie Karniol
fab3fcb112 Vastly improved Estonian translation bundle (#737) 
* Minor user interface tweaks

* Vastly improved Estonian translation bundle
 2019-10-14 23:48:25 -04:00
Maxwelllondon92
a4b6b88b76 Update bundle_it.properties (#730) 
* Update bundle_it.properties

Minor corrections and mistypes.
added translation to armored conveyor, rally command
added Editor translation
added UI translation
Adjustment made to the tutorial instruction

* Update bundle_it.properties

correction for wrong name and description of pixelation setting

* Update bundle_it.properties

Minor corrections to keybind menu settings

* Update bundle_it.properties

Corrections: some mech pads were mistakenly translated as ship pads
 2019-10-14 23:46:11 -04:00
Mengyang Li
cbfc766e55 hud: show player position (#717) 
* hud: show player position

* hud: clean up old statement

* hug: address comments
 2019-10-14 23:42:03 -04:00
njwlgamer
d19c3daa67 Update bundle_nl.properties (#667) 2019-10-14 23:41:02 -04:00
ねらひかだ
86eb832446 Japanese Translations for Google Play (#713) 
* Copy descriptions for Google Play

* Update descriptions for Google Play

* Delete not need files

* Add contributors, fix some translations

* Very small changes

* Very small changes 2

* campaign...?

Japanese is not familiar with the word "campaign"
 2019-10-14 23:37:33 -04:00
AmateurPotion
ebb859238c Update bundle_ko.properties (#818) 
* Update bundle_ko.properties

* Update bundle_ko.properties
 2019-10-14 23:22:33 -04:00
dase1353
a45fc2c030
Update bundle_zh_TW.properties 2019-10-14 11:43:08 +08:00
Tunacan427
4d91c8f8b7
Merge branch 'master' into master 2019-10-13 23:52:01 +03:00
Anuken
3d624f7eaf Added inverted sorter 2019-10-13 12:58:58 -04:00
Anuken
a09320cb4a A warning 2019-10-12 23:12:02 -04:00
laohuaji233
d65f54c27b
Update bundle_zh_CN.properties 2019-10-10 00:01:33 +08:00
clfer
4a78a04168
Update bundle_fr.properties 2019-10-09 10:03:31 +02:00
Anuken
3a3c5e2304 Merge remote-tracking branch 'origin/master' 2019-10-08 21:30:55 -04:00
Anuken
31e4b2752f Various fixes 2019-10-08 21:27:37 -04:00
azureblue
b43db6035f Power Lasers Transparency (#778) 
* Render each visible power link only once.

* Set power lasers opacity based on the setting

* Change power laser colors to work better with transparency

* Slightly reducing power laser width

* Change laser color to the original, minor refactoring

* Change power laser opacity setting label

* Add laser opacity setting text to bundles

* Remove "Show Power Lasers" setting as it's redundant (replaced by lasers opacity setting), changing default laser opacity setting to 100%

* Remove "setting.lasers.name" from other bundles
 2019-10-08 19:32:00 -04:00
dase1353
eebfc2d6c5
Update bundle_zh_TW.properties 2019-10-08 08:55:13 +08:00
dase1353
3805497d71
Update bundle_zh_TW.properties 2019-10-08 08:46:45 +08:00
dase1353
a4ea062a83
Update bundle_zh_TW.properties 2019-10-08 08:37:44 +08:00
dase1353
e46daeed97
Update bundle_zh_TW.properties 2019-10-08 08:34:49 +08:00
Anuken
9fdc4a2c45 Delete old requests, pause building 2019-10-07 20:26:08 -04:00
azureblue
71fc20d971
fixing and improving translation, making letters case more consistent 2019-10-08 02:10:43 +02:00
clfer
c4cab3ed03 Update bundle_fr.properties - Integrate latest bundle.properties changes 2019-10-08 01:17:36 +02:00
Runi Arnsbjörnson
4bcd907f5b Update bundle_fr.properties - runiArnsbjornson update 2019-10-08 00:57:05 +02:00
Anuken
989e0d8fd1 Removal of drone requests 2019-10-07 17:17:01 -04:00
Stephen Owen
5a749ac106
Converted Romaji to Kanji 
somehow typed author '著者' in Romaji and wasn't auto corrected to kanji in this case 😰
 2019-10-07 09:52:19 -04:00
Stephen Owen
5831576d21
Adds Japanese menu items for Mods 
Adds Japanese menu content for Mods top level menu, and also mod menu items themselves
 2019-10-07 09:49:40 -04:00
dase1353
df9ea97863
Update bundle_zh_TW.properties 2019-10-07 17:31:29 +08:00
Anuken
20462b91d4 Major refactoring of building input in progress 2019-10-06 16:56:31 -04:00
osoitz
19afb81bf6
Update bundle_eu.properties 2019-10-06 16:22:02 +02:00
Amon-Senpai
a049b4faa6
Update bundle_de.properties 
Corrected some words
 2019-10-06 11:58:00 +02:00
dase1353
c554d791bb
Update bundle_zh_TW.properties 2019-10-06 17:23:00 +08:00
dase1353
01519e75a0
Update bundle_zh_TW.properties 2019-10-06 17:10:52 +08:00
PlayerBrasil13
b6396990ba
Update bundle_pt_BR.properties 2019-10-05 18:11:26 -03:00
PlayerBrasil13
bdd74bfcc3
Update bundle_pt_BR.properties 2019-10-05 18:09:14 -03:00
PlayerBrasil13
aaadca8287
Update bundle_pt_BR.properties 2019-10-05 18:08:42 -03:00
PlayerBrasil13
8873b2368f
Update bundle_pt_BR.properties 
Made by:
@Predator127 /September#9140
@PlayerBrasil13  /PlayerBrasil13#6078
 2019-10-05 17:44:31 -03:00
Anuken
4b99f7c819 Cleanup, bugfixes 2019-10-05 15:51:29 -04:00
dase1353
94a2ab23ba
Update bundle_zh_TW.properties 2019-10-05 19:09:11 +08:00
dase1353
b8c4f46630
Update bundle_zh_TW.properties 2019-10-05 19:06:15 +08:00
Anuken
e5c7d5dd2f Config banned blocks 2019-10-05 01:16:03 -04:00
Anuken
c1ff7812d8 Zone objective abstraction, cleanup 2019-10-05 00:21:48 -04:00
Kemal
66925bfc7f Merge branch 'master' of https://github.com/Tunacan427/Mindustry 2019-10-05 03:53:44 +03:00
Kemal
e8c7bd1d32 Some small changes to translation. 2019-10-05 03:53:35 +03:00
Anuken
edb0ece03b More mod content support 2019-10-04 19:14:45 -04:00
dase1353
12164098a6
Update bundle_zh_TW.properties 2019-10-05 03:13:06 +08:00
dase1353
48145e4e77
Update bundle_zh_TW.properties 2019-10-05 03:08:45 +08:00
Anuken
8f0eefa97e Bug report link, proper minimap colors 2019-10-03 22:26:13 -04:00
Anuken
bc02d178ce Support for zones 2019-10-03 18:53:43 -04:00
clfer
3fb1f5f54a Update bundle_fr.properties - Integrate latest bundle.properties changes 2019-10-04 00:39:07 +02:00
clfer
335bfab746 Update bundle_fr.properties - Spelling, accent, wordings, spacing 2019-10-04 00:38:21 +02:00
clfer
2d4d943b61 Update bundle_fr.properties 2019-10-04 00:37:42 +02:00
Tunacan427
f06e5ed87f
Merge branch 'master' into master 2019-10-03 21:39:33 +03:00
Tunacan427
bd777e610f
Update contributors 2019-10-03 21:27:25 +03:00
azureblue
bdcccb0344
adding missing comma 2019-10-03 19:38:54 +02:00
Anuken
46f118db13 Added link to modding guide 2019-10-03 12:51:25 -04:00
azureblue
6d2a4d4d2b
more bundle_pl translation changes 
Made a few more changes as I came across translations that were completely wrong.
 2019-10-03 18:45:28 +02:00
Miguel de Dios Matias
8e0979020d Update the spanish strings. 2019-10-03 17:53:51 +02:00
Miguel de Dios Matias
7e11cd29e1 Updated and fixed some spanish translations and added empty lines and unstranslated lines from english (to keep the similar structure). 2019-10-03 17:38:49 +02:00
azureblue
6dc1a21cf0
fixing typo 
Co-Authored-By: Draco <54777154+Dr4coDragon@users.noreply.github.com>
 2019-10-03 16:51:19 +02:00
Anuken
cce0040eaf why does this work 2019-10-02 23:17:06 -04:00
Anuken
3369de6bf7 Merge remote-tracking branch 'origin/master' 2019-10-02 23:09:51 -04:00
Anuken
532926a9e3 Mod reloading that works for some ridiculous reason? 2019-10-02 23:09:35 -04:00
PlayerBrasil13
9e9d2496ed Update bundle_pt_BR.properties (#735) 
* Update bundle_pt_BR.properties

* Update bundle_pt_BR.properties

* Update bundle_pt_BR.properties

* Update bundle_pt_BR.properties

* Update bundle_pt_BR.properties
 2019-10-02 21:29:59 -04:00
Anuken
ffd4297b17 Mod corruption load warnings 2019-10-02 21:23:29 -04:00
Anuken
76dbc1cca3 Fixed ore/editor icon generation 2019-10-02 20:25:33 -04:00
azureblue
f5b6e13a1c
Update bundle_pl.properties 
Added some missing translations and made changes to existing ones (also changing some units name).
 2019-10-03 00:51:35 +02:00
Anuken
2db3060a03 Made content icon system more sane 2019-10-01 23:46:40 -04:00
Miguel de Dios Matias
56cc806d01 Fixed the spanish translation 'silicona' -> 'silicio'. (#758) 2019-10-01 11:55:31 -04:00
cheese1
4f2bfb2406 Update bundle_de.properties (#752) 2019-09-30 17:42:31 -04:00
Anuken
7cd220fe8c Display more launch info / Store mod list in saves 2019-09-29 23:40:23 -04:00
Anuken
7fccd18910 Server mod checking 2019-09-29 22:59:23 -04:00
Anuken
73e9f55e55 More tutorial info 2019-09-29 21:51:45 -04:00
Anuken
002a052371 Fixed #748 / Better mod loading 2019-09-29 21:41:32 -04:00
Anuken
0049a0004e Block rotation / Mod loading improvements 2019-09-29 19:54:52 -04:00
Anuken
b0503d9930 Merge branches 'master' and 'mods' of https://github.com/Anuken/Mindustry 
# Conflicts:
#	core/src/io/anuke/mindustry/entities/type/FlyingUnit.java
#	gradle.properties
 2019-09-29 17:03:28 -04:00
Prosta4okua
2b8878e724 Ukrainian language (#715) 
* Fixes

* Капіталізація це зло.

* Update bundle_ru.properties

* Update bundle_uk_UA.properties

* .-.

* Gm

Description

* Oof

* ЈҮУКЕНГШҺЗХҸЖДЛОРПАВЫӘЧСМИТҒБӨ

* dada

* Translate new descriptions

* й

* Ukrainian finished. Fixed some errors.

* Translated everything. Maybe.

* /

* 1

* Added tutorial. Thank to Slava0135 and ymomfe.

* 1

* 1

* WATER

WATER

* [[]]

* 1

* gmmm

/-/-/-/

* idk what i changed

* Обновление и корректировка строк с 1 по 90

* router

* Обновление и корректировка строк с 87 по 252

Обновление и корректировка строк с 87 по 252, а так же правка предыдущих.
- 35 строку лучше привести в соответствии с оригинальным текстом, без дополнений и пояснений.
- 103 строка не переводится в соответствии с https://semver.org/lang/ru/ , хотя это не жёсткое правило, поскольку не влияет непосредственно на алгоритм работы с версиями.
- 187 Предлагаю эту строку перевести как 'Настройки карты', не смотря на оригинальный текст (соответственно и 230, 231).

* router

* Create description.txt

* Update description.txt

* Create short-description.txt

* Create achievements.vdf

* Update achievements.vdf

* Update bundle_uk_UA.properties

* Update achievements.vdf

* Update achievements.vdf

* Update achievements.vdf

* Update achievements.vdf

* Update achievements.vdf

* 000b23d703
^
 2019-09-29 12:53:52 -04:00