mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-19 00:37:20 +07:00
Code Issues Packages Projects Releases Wiki Activity
12,798 Commits 4 Branches 160 Tags 2.3 GiB
2d5e9118a5
Commit Graph

12798 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken
2d5e9118a5 I do not know bash 2021-11-22 12:04:51 -05:00
Anuken
261ad5dae5 BundleLauncher moved to gradle script 2021-11-22 12:04:09 -05:00
Anuken
e0b14db778 Added bundle updates as part of commit 2021-11-22 11:52:08 -05:00
Anuken
521b0e1ec4 Automatic bundle update 2021-11-22 11:50:28 -05:00
Anuken
d550ad5614 no 2021-11-22 11:44:28 -05:00
Anuken
8717fd8b33 Better bundle updater implementation 2021-11-22 11:43:13 -05:00
Anuken
ef1084302f Merge remote-tracking branch 'origin/master' 2021-11-22 10:31:10 -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
MrDuck557
25f98fdeb0
engineColor (#6360) 
Co-authored-by: Lele567 <48808663+Lele567@users.noreply.github.com>
 2021-11-22 10:11:03 -05:00
MrDuck557
f1e9d05163
blinkSize (#6359) 
Co-authored-by: Lele567 <48808663+Lele567@users.noreply.github.com>
 2021-11-22 10:08:57 -05:00
Valeriy
f81d519c91
Add to v7 (#6357) 2021-11-21 10:38:06 -05:00
Valeriy
5a03083b57
Removing from v6 (#6356) 2021-11-21 10:37:58 -05:00
Anuken
77fb5a9a24 conflict 2021-11-20 15:07:07 -05:00
Anuken
d87ee0e942 conflict 2021-11-20 15:06:51 -05:00
Anuken
0dc8c6cd25 Updated bundles 2021-11-20 15:06:14 -05:00
Lin
aeaba6e111
Update bundle_zh_CN.properties (#6300) 
* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties
 2021-11-20 15:05:55 -05:00
Prosta4okua
0e8a677ecc
Update bundle_uk_UA.properties (#6290) 
* Update bundle_uk_UA.properties

Атака -> Наступ

* Update bundle_uk_UA.properties

конструкції->споруди

* Update bundle_uk_UA.properties

* Приголомшлює -> електризує

* Small fixes

→ -> "->"
елемент -> предмет
Оксино -> Оксиноя, better spelling

* Update bundle_uk_UA.properties
 2021-11-20 15:05:46 -05:00
Anuken
b4cd21752c Merge remote-tracking branch 'origin/master' 2021-11-20 10:58:12 -05:00
Anuken
d1a5198efc Fixed #6351 2021-11-20 10:58:07 -05:00
devlaq
731fd2900a
Update servers_v6.json (#6348) 2021-11-18 18:28:52 -05:00
Anuken
51626b6233
spelling 2021-11-17 09:41:18 -05:00
hortiSquash
fd1678dbc9
Unloading into plast belts - bug fix (#6347) 
* hortiloaders hotfix randomness

Improved the unloaders' balance with multiple blocks having the same load

* deterministic lets go

Co-Authored-By: citrusMarmelade <20476281+citrusMarmelade@users.noreply.github.com>

* update contributors

forgot to add them since they helped a lot for the previous commits/PRs

* unloader - fix cant load

Co-authored-by: citrusMarmelade <20476281+citrusMarmelade@users.noreply.github.com>
 2021-11-17 09:35:36 -05:00
Anuken
f87cd9c643
Do not make formatting PRs. 2021-11-16 23:36:13 -05:00
Matthew Peng
4a7774fe5a
Dynamic resupply check (#6338) 2021-11-15 09:27:22 -05:00
Anuken
d23813f328 Merge remote-tracking branch 'origin/master' 2021-11-15 08:24:47 -05:00
Anuken
f586fd285c Fixed #6341 2021-11-15 08:24:39 -05:00
Rex
a786e93329
Update servers_v6.json (#6332) 2021-11-13 18:55:28 -05:00
Yuri Polyakov
df3901fda2
why (#6330) 
The server is on version v6 is in the list of servers v7.
 2021-11-12 23:29:15 -05:00
Rex
bb443e359f
Update servers_v6.json (#6322) 
* Update servers_v6.json

* Update servers_v6.json

* Update servers_v6.json
 2021-11-10 13:37:38 -05:00
MrDuck557
1c4e6b77b4
DestroyBullet (#6311) 
* DestroyBullet

* one space

* review

Co-authored-by: Lele567 <48808663+Lele567@users.noreply.github.com>
 2021-11-09 18:10:28 -05:00
LawrenceLin2333
68f8668162
Fix the memory leak when light rendering is disabled (#6321) 2021-11-09 11:10:18 -05:00
Matthew Peng
51730556a5
Batteries can be overdrived. (#6320) 2021-11-08 21:43:00 -05:00
Goobrr
c2b5e4b82b
Show internal names (#6317) 
* internal names

* enableConsole

* how did this get left out
 2021-11-08 19:25:17 -05:00
JrTRinny
c96b723aaa
more delectable selection pane (#6318) 2021-11-08 18:12:23 -05:00
Anuken
af7c11c4b7 Merge remote-tracking branch 'origin/master' 2021-11-08 08:56:32 -05:00
Anuken
656bb34b68 Fixed #6314 2021-11-08 08:56:26 -05:00
Matthew Peng
1dd0f67daf
recoil = recoilAmount twice (#6312) 2021-11-07 22:33:11 -05:00
Matthew Peng
fff7283568
Pointless if (#6310) 2021-11-06 21:12:38 -04:00
OSP
b88ddef3c5
XCore hosting is now exists. (#6308) 2021-11-06 11:56:30 -04:00
Valeriy
93c6fa64f7
Unsuccesful updating (#6302) 
I have unsuccesful update to 134.1, because i need a create ALL maps from 0.
 2021-11-05 09:42:10 -04:00
Anuken
24ca434bae Take into account string length in client snapshots 2021-11-05 08:51:59 -04:00
Anuken
189604474c These things exist now 2021-11-04 22:34:42 -04:00
Anuken
5fe8ed88a6 Fixed #6305 2021-11-04 22:30:19 -04:00
Anuken
b553f5afc2 Merge remote-tracking branch 'origin/master' 2021-11-04 22:23:36 -04:00
Anuken
9e68b0a72b Fixed #6304 2021-11-04 19:34:28 -04:00
Matthew Peng
7884bbd299
stack conveyor looks weird on payload conveyors (#6295) 2021-11-03 13:37:02 -04:00
Matthew Peng
996193ea69
payloadRotation field (#6294) 2021-11-03 13:34:42 -04:00
Matthew Peng
3574b982ab
misspelling (#6291) 2021-11-02 22:03:47 -04:00
Matthew Peng
a438be7fcd
when and why was this hardcoded (#6289) 2021-11-02 20:22:07 -04:00
Valeriy
921c113375
Moving to v7 (#6285) 2021-11-02 11:27:14 -04:00