mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-03-11 02:19:56 +07:00
Code Issues Packages Projects Releases Wiki Activity
6,607 Commits 4 Branches 160 Tags 2.3 GiB
74e94e5344
Commit Graph

6607 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken
bc7671b08d Merge remote-tracking branch 'origin/master' 2020-02-27 10:08:19 -05:00
Anuken
709bd4952f Added PC hardware flag 2020-02-27 10:08:09 -05:00
xaumex
c361e5c26d
Update Silicon translation in spanish (#1639) 
Silicone (en) = Silicona (es)
Silicon (en) = Silicio (es)
 2020-02-26 11:01:56 -05:00
Patrick 'Quezler' Mounier
8bbd8489e0
Remember scroll position when a new message gets added (#1638) 2020-02-25 12:06:18 -05:00
Anuken
5f8a0ec12e Tweaks 2020-02-25 10:04:37 -05:00
DeltaNedas
0c01554a6b
add floatf/p and func to global.js (#1633) 2020-02-24 15:06:33 -05:00
Ali-C-Ila
251877f561
Update bundle_zh_TW.properties (#1579) 
* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties
 2020-02-24 11:46:20 -05:00
Patrick 'Quezler' Mounier
ce1884512d
Null the block as well? (#1630) 2020-02-24 11:44:39 -05:00
soytheLB
c989504bf6
Update bundle_es.properties (#1624) 
Corrected some misspellings.
Added warning text in router.
Changed description of alloy smelter to keep with the translated name of surge alloy.
Added a missed dot from my previous translation.
 2020-02-23 10:44:09 -05:00
Patrick 'Quezler' Mounier
e592d6fe52
Add nydus to global server list (#1625) 2020-02-23 10:34:53 -05:00
Anuken
91f2eaf53a Bugfixes 2020-02-22 20:02:41 -05:00
Anuken
c8a762df42 Minor assignment tweak 2020-02-22 19:53:14 -05:00
Anuken
66bcb294fb Update issue templates 2020-02-22 19:35:14 -05:00
Anuken
501e909039 Merge remote-tracking branch 'origin/master' 2020-02-22 19:32:10 -05:00
Anuken
2cd69230e0 Changed feathub link 2020-02-22 19:32:01 -05:00
Anuken
ae66ca468d
Update README.md 2020-02-22 19:30:02 -05:00
Anuken
0846198721 Updated issue templates 2020-02-22 19:25:05 -05:00
Vanguard
5735fba4c7
2 changed lines 
unit.thousands
unit.millions
 2020-02-22 20:21:05 +03:00
GioIacca9
47618ac21f
Translated #1593 (#1621) 2020-02-22 10:33:22 -05:00
Patrick 'Quezler' Mounier
f891c42847
Remove bundle key space (#1619) 2020-02-22 08:43:54 -05:00
Vanguard
2fc17fea2a
1 new line 
rules.solarpowermultiplier
 2020-02-22 04:04:53 +03:00
Petr Gašparík
0a98597ad0
Czech translation - sync with v104 (#1612) 
* Czech translation - sync with changes

* Czech translation - sync with updates

* Czech translation - small fix
 2020-02-21 16:27:05 -05:00
Patrick 'Quezler' Mounier
b7a8fa4191
Fix typo in banned comment (#1617) 2020-02-21 13:49:15 -05:00
DeltaNedas
fe22d334dc
Separate ambient light and solar panel efficiency (#1593) 
* new branch

* Separate ambient light and solar panel efficiency

* Made ambient light -> solar efficiency default
 2020-02-21 11:38:56 -05:00
bobthebadguy
de560ac6f8
Fixed small typo (#1613) 
Now there are 70 pull requests.
 2020-02-21 09:58:11 -05:00
Patrick 'Quezler' Mounier
ff652f2515
+1 technical correctness (#1615) 2020-02-21 09:57:48 -05:00
Anuken
abec83a3e1
Merge pull request #1611 from Dexapnow/patch-1 
Update bundle_pl.properties
 2020-02-20 10:46:37 -05:00
Dexapnow
23e4d1dd84
Update bundle_pl.properties 2020-02-20 14:05:38 +01:00
Petr Gašparík
2b0f06649c Czech translation - small fix 2020-02-20 12:14:06 +01:00
Petr Gašparík
f818f787c3 Czech translation - sync with updates 2020-02-20 12:11:21 +01:00
Petr Gašparík
405c37abcd Merge branch 'master' of https://github.com/Anuken/Mindustry into v104 2020-02-20 12:10:42 +01:00
Dexapnow
3bb4820e79
Update bundle_pl.properties 
Some things just were confusing
 2020-02-20 09:46:37 +01:00
Anuken
32dcae8fd3
Update bundle.properties 2020-02-19 13:49:40 -05:00
Petr Gašparík
60079c79f3 Czech translation - sync with changes 2020-02-19 19:26:44 +01:00
Petr Gašparík
c60f817f2c Merge branch 'master' of https://github.com/Anuken/Mindustry into v104 2020-02-19 19:16:52 +01:00
Anuken
e8ca5fe211 More iOS stuff 2020-02-19 11:03:12 -05:00
Anuken
b2dd2c8441 Cleanup 2020-02-19 10:31:15 -05:00
Anuken
73995c7764 Merge remote-tracking branch 'origin/master' 2020-02-19 10:21:42 -05:00
Anuken
a866af40cb iOS fixes 2020-02-19 10:21:35 -05:00
Vanguard
10732ccb5a
1 line removed 
schematic.replace
 2020-02-19 15:33:53 +03:00
Anuken
6317e0816a
Merge pull request #1607 from hellomouse/name-change-fix 
Reset local player name on disconnect
 2020-02-18 23:52:05 -05:00
iczero
b3e9e12279
Reset local player name on disconnect 2020-02-18 21:52:42 -05:00
Anuken
4a55dde5ee Bugfixes 2020-02-18 19:54:35 -05:00
Anuken
378a5d5239 Removed bloom on iOS 2020-02-18 12:40:53 -05:00
Anuken
62330d6c99 Merge remote-tracking branch 'origin/master' 2020-02-18 12:23:07 -05:00
Anuken
10f3c722b6 iOS fixes 2020-02-18 12:23:04 -05:00
Anuken
711faa6e2a
Merge pull request #1597 from GioIacca9/patch-3 
Update block.pyratite-mixer.description
 2020-02-18 11:51:37 -05:00
Anuken
48124bc731
Merge pull request #1603 from indielm/patch-4 
Update servers.json
 2020-02-18 11:45:12 -05:00
Anuken
0f43690aaf More unlocks? 2020-02-18 11:43:06 -05:00
Anuken
a655e18b87 Merge remote-tracking branch 'origin/master' 2020-02-18 11:35:36 -05:00