mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-03-06 07:30:35 +07:00
Code Issues Packages Projects Releases Wiki Activity
13,276 Commits 4 Branches 160 Tags 2.3 GiB
feb1135bcc
Commit Graph

103 Commits

Author SHA1 Message Date
Anuken
a48911b983 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/assets/bundles/bundle_ko.properties
	core/assets/bundles/bundle_zh_CN.properties
	core/assets/bundles/bundle_zh_TW.properties
 2021-11-22 12:11:31 -05:00
Anuken
521b0e1ec4 Automatic bundle update 2021-11-22 11:50:28 -05:00
Anuken
c8397c9d10 Reverting bundle update (see description) 
The bundle updater removed quite a lot of comments and extra details. I will be rewriting the bundle launcher to fix this.
 2021-11-22 10:31:01 -05:00
Anuken
65f36faf71 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/assets/bundles/bundle_ko.properties
	core/src/mindustry/type/UnitType.java
 2021-11-22 10:12:48 -05:00
Anuken
0dc8c6cd25 Updated bundles 2021-11-20 15:06:14 -05:00
Anuken
82eb3a9159 Alloy smelter rename / WIP block ideas 2021-11-16 22:37:13 -05:00
Anuken
486622e3e4 Many crazy things 2021-11-14 23:10:15 -05:00
Anuken
7e047ef726 Stone craters name fix 2021-08-09 12:13:07 -04:00
Anuken
b80129e17b Improved environmental block internal names 2021-08-06 11:52:25 -04:00
Diegator04
70c6cd2e87
Complete bundle_it 
I compared the **@GioIacca9's bundle** with mine so I was able to notice **mistakes** and **missing translations** which I corrected. We worked together and we discussed about a suitable words and phrases in italian. Furthermore I added the **first version** of _unit's names_, we'll improve them in the future.
 2020-12-04 13:55:22 +01:00
GioIacca9
039f5ef8db
fixes 2020-12-01 08:27:39 +01:00
GioIacca9
a87e58db93
v6 Italian bundle 2020-11-30 22:16:13 +01:00
Anuken
f81f4ded03 Updated bundles 2020-10-23 11:52:01 -04:00
Anuken
2ff749bd17 Unified stat system 2020-10-19 11:34:52 -04:00
Leonwang4234
14156c1ce7 "cryofluidmixer" to "cryofluid-mixer"fl 2020-09-30 17:54:50 -07:00
Anuken
28b7ef53bb Updated bundle contents 2020-09-23 18:28:25 -04:00
Anuken
aec4a07aec Fixed steam-generator bundle name 2020-09-10 10:29:54 -04:00
Anuken
3b5d6860d6 Bugfixes 2020-09-09 23:39:00 -04:00
Anuken
b9ff4ba9c5 Bugfixes 2020-08-20 16:21:40 -04:00
Anuken
42d7eb4e05 Bugfixes 2020-07-25 19:08:25 -04:00
Anuken
58c39e14d6 risse -> risso 2020-07-24 13:27:15 -04:00
Anuken
69f6154894 Updated bundles 2020-07-23 17:12:55 -04:00
Anuken
85d67db1ed
Merge pull request #2175 from AlbertCerfeda/patch-2 
Minor changes
 2020-07-14 14:58:13 -04:00
Anuken
752cccb588
Merge pull request #2062 from GioIacca9/patch-11 
Minor changes
 2020-07-14 14:45:51 -04:00
Albert Cerfeda
5a1c9ce785
Minor changes 2020-06-19 15:53:21 +02:00
Albert Cerfeda
2ee518c9fc
Uppercase initial of 'Trello' (#2174) 2020-06-19 08:06:31 -04:00
GioIacca9
898c07c4af
Minor changes 2020-05-15 16:21:39 +02:00
zethnest
2dfa334ba6
Lowercases ColorNames (#2053) 
* lowercase colornames

* change yellow to accent
 2020-05-13 14:38:26 -04:00
GioIacca9
eef4137a59
Updated bundle_it to dfcf11f (#1929) 2020-04-28 12:27:00 -04:00
Anuken
dfcf11fb07 Removed mech-related bundle entries 2020-04-26 11:24:52 -04:00
GioIacca9
25bc6ebaf0
Minor changes (#1858) 2020-04-13 21:22:49 -04:00
shadowpazzo
b3cd492a13
little fix to surge things and more understandable words (#1778) 
i think lega supercarica is better than lega di sovratensione for italians and more
 2020-04-03 11:04:41 -04:00
GioIacca9
b37ea872a8
Update bundle_it.properties 2020-03-28 08:51:56 +01:00
Anuken
b284d6892a Updated bundles with missing text 2020-03-27 16:13:41 -04:00
GioIacca9
ec30b0fa94
Update bundle_it.properties (#1755) 2020-03-26 11:30:04 -04:00
Anuken
31c9b61358
Updated join.info (#1666) 2020-03-04 13:53:47 -05:00
GioIacca9
47618ac21f
Translated #1593 (#1621) 2020-02-22 10:33:22 -05:00
GioIacca9
941449c502 Updated "Full implementation of #1494" (#1541) 2020-02-09 22:26:47 -05:00
GioIacca9
b4be655d0c
Translated stat.playtime (#1485) 2020-02-03 12:54:06 -05:00
Nickibosss
1207fb1440 Update bundle_it.properties (#1431) 2020-01-25 17:51:43 -05:00
GioIacca9
3dda4badac Update bundle_it.properties (#1428) 2020-01-24 10:04:37 -05:00
GioIacca9
9efff27b77 Updated underflow gate (#1416) 
Translated:
`block.underflow-gate.name` and `block.underflow-gate.description`.
`data.openfolder`
and other minor strings
 2020-01-23 18:07:16 -05:00
GioIacca9
87442853bb Added setting.bridgeopacity.name (#1347) 2020-01-10 11:17:48 -05:00
GioIacca9
08bae1fa15 Updated liquid void name and description (#1341) 2020-01-08 16:57:36 -05:00
Anuken
8f208920f7 Merged in liquid void 2020-01-08 11:04:12 -05:00
Anuken
1193e18ee1 Updated bundles post-merge 2020-01-08 11:01:12 -05:00
Alessandro Maurizio
b5d5bb21b1 Fix Steam Achievement italian translation error (#1324) 
* Fix Steam Achievement italian translation error

* Fix wrong Revenant Factory italian description
 2020-01-08 10:30:11 -05:00
GioIacca9
3e636b73ce Updated Italian translations (#1297) 
* Update it-IT translation

* Update bundle_it.properties
 2020-01-08 10:21:09 -05:00
GioIacca9
e200dcee33 Update bundle_it.properties (#1240) 2019-12-29 18:51:45 -05:00
joshuaptfan
736737f151 Make scroll zoom by default, remove zoom hold keybind 2019-12-12 12:23:32 -08:00