Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,117 Commits 4 Branches 180 Tags
2f45bb596bcf12d3adaf2ed855bf95ec9285f90e
Commit Graph

5455 Commits

Author SHA1 Message Date
Catchears
224cc80b59 update heat source description to match other sources (#7230) 
* update heat source description to match other sources

* correct to large amounts of heat
 2022-07-28 09:39:30 -04:00
Anuken
d98f26d35b Erekir unit logic ID order changed 2022-07-22 14:10:46 -04:00
Anuken
0e81d19bd4 Merge remote-tracking branch 'origin/master' 2022-07-22 14:06:40 -04:00
Anuken
8eabe419c5 Heat source warmup fix 2022-07-22 14:06:34 -04:00
Github Actions
43f7384855 Automatic bundle update 2022-07-22 18:00:35 +00:00
RTOmega
9a3a6c31b3 Adding Block: Heat Source (#6855) 
* Update Blocks.java

* ,

* Update Blocks.java

* Add files via upload

* Delete 5618F7BA-F0D0-4FFF-AE6A-185BFEA99F16.png

* Add files via upload

* Add files via upload

* Add files via upload

* Update Blocks.java

* Bundle

* 1m to 10k

* Update bundle.properties

* TR

* 10k to 1k

Co-authored-by: Anuken <arnukren@gmail.com>
 2022-07-22 13:59:32 -04:00
Anuken
687d0b4f00 Misc minor bugfixes 
at 4 AM
 2022-07-22 03:51:24 -04:00
Github Actions
b94393f150 Automatic bundle update 2022-07-19 02:16:10 +00:00
Anuken
1c2aca91e4 Merge remote-tracking branch 'origin/master' 2022-07-18 22:14:57 -04:00
Anuken
a6ae178b46 Misc minor fixes 2022-07-18 22:14:53 -04:00
Epowerj
2332d9bee1 Tweaked intersect 2022-07-18 13:41:04 -04:00
Epowerj
a36a87fa83 Added an extra island to lake 2022-07-18 13:37:18 -04:00
Epowerj
1529d4ecc9 Tweaked aegis 2022-07-18 11:22:26 -04:00
Epowerj
fceec59a61 Added more resources to onset 2022-07-18 11:21:13 -04:00
Github Actions
32871920b2 Automatic bundle update 2022-07-18 00:36:56 +00:00
Anuken
494440a591 Fixed incorrect 'command mode' hint on mobile 2022-07-17 20:35:49 -04:00
Anuken
1e7219f7d1 Merge remote-tracking branch 'origin/master' 2022-07-17 10:27:31 -04:00
Anuken
ebf9e82146 Crash fixes / Mod browser >=136 filter 2022-07-17 10:27:27 -04:00
Github Actions
ffff3fa351 Automatic bundle update 2022-07-17 13:22:44 +00:00
Lucky Clover
93f12a5544 Update bundle_zh_CN.properties (#7135) 
* Update bundle_zh_CN.properties

* 部分补充

* 光彩统一改成光效

* Update bundle_zh_CN.properties

Thanks @SoMall-dumpling for review

* Suggestions from @xem8k5, @Cry0flu1d and more

* thanks mi2/xerxer

* miner fix

* Corrections from SoMall-dumpling

* Update suggestions from  @nanmenyangde

* liquid翻译讨论确定：液体->流体

* from @nanmenyangde

* suggestion from @SoMall-dumpling & @BlackDeluxeCat
 2022-07-17 09:21:53 -04:00
Github Actions
4ac7254842 Automatic bundle update 2022-07-16 15:32:30 +00:00
ThatOneBepis
4c80cf90cc Update bundle_sr.properties (#7181) 2022-07-16 11:31:35 -04:00
Anuken
d3210a0831 Misc minor fixes 2022-07-15 20:25:42 -04:00
Anuken
830a771a90 Merge remote-tracking branch 'origin/master' 2022-07-15 19:28:40 -04:00
Anuken
2ec1f9f55d typo 2022-07-15 19:28:35 -04:00
Github Actions
2e7dca06ed Automatic bundle update 2022-07-15 23:27:34 +00:00
Anuken
8d6cac39d0 Fixed #7178 / Maps renamed 2022-07-15 19:26:23 -04:00
Anuken
f6093c864f Fixed map-3 waves 2022-07-15 18:57:01 -04:00
Anuken
9eacbb45d1 glenn what did you do 2022-07-15 17:14:57 -04:00
Anuken
926cf7e0fa Fixed some messed-up objectives 2022-07-15 16:56:34 -04:00
Github Actions
3907a23fb4 Automatic bundle update 2022-07-15 14:42:13 +00:00
GlennFolker
695c19d0b0 Tree-like objective node structure (#7152) 
* overall structure

* overall layout

* field interpreter

* less bloated UI

* scroll pan't

* strip off the 'Marker' suffix

* e

* all (hopefully all...) interpreters finished.

* onset

* two, four

* i don't understand how icon mappings work.

* separate remover and indexer

* some cleanups

* untested mobile support

* contrib

* ok anuke

* fix conflicts 2

* hidden
 2022-07-15 10:41:18 -04:00
BetaEridani
d72d663219 Update bundle_fi.properties (#7164) 
Swapped the places of two text lines to correct a mistake.
 2022-07-14 23:37:14 -04:00
Github Actions
bb7f96437c Automatic bundle update 2022-07-15 03:34:36 +00:00
Catchears
e4274c2b49 german erekir & v7 translation (#6869) 
* initial german erekir translation

* first ideas

* Update bundle_de.properties

added missing ones, fixed some typos

* Update bundle_de.properties

* Update bundle_de.properties

* suggested changes

* shawak's changes

* update to 4c3ee57ce9

* update to 3927841f43

* update to 371394df6f

* update to d6539b267c

Co-authored-by: JoeFLYtheCoder <73280709+jdopss@users.noreply.github.com>
Co-authored-by: Anuken <arnukren@gmail.com>
 2022-07-14 23:33:26 -04:00
Github Actions
521519c8ab Automatic bundle update 2022-07-14 19:45:43 +00:00
Epowerj
6aa9623512 Added a temporary description for four 2022-07-14 15:44:32 -04:00
Github Actions
07427e68a1 Automatic bundle update 2022-07-14 19:28:44 +00:00
Epowerj
f149bed64e Tweaked split 2022-07-14 15:11:11 -04:00
Epowerj
9d3bf2d489 Tweaked split 2022-07-14 15:06:57 -04:00
Epowerj
43416f90e5 Added description to split 2022-07-14 14:50:00 -04:00
Epowerj
3a3eb2c63d Progress on split 2022-07-13 15:05:52 -04:00
Epowerj
24e70faf02 Start reworking split 2022-07-12 20:37:17 -04:00
Epowerj
458ab9d639 tweaked atlas 2022-07-11 21:36:15 -04:00
Epowerj
ca18b851a1 Tweaked atlas, set max squad size 2022-07-11 18:44:28 -04:00
Epowerj
4812ff47c0 Merge branch 'master' of https://github.com/Anuken/Mindustry into maps 2022-07-11 18:39:06 -04:00
Github Actions
9d4839b26d Automatic bundle update 2022-07-11 22:19:30 +00:00
Anuken
72b36d97bd RTS max squad size 2022-07-11 18:18:22 -04:00
Github Actions
a7db6d86ff Automatic bundle update 2022-07-11 21:16:23 +00:00
Epowerj
7aea85668b forgot period lol 2022-07-11 17:15:11 -04:00