Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,242 Commits 4 Branches 180 Tags
76f151789aa74c8a31fd5f58c140122525ed3ce8
Commit Graph
13712 Commits
Author SHA1 Message Date
Anuken ddc637eee6 Merge remote-tracking branch 'origin/master' 2022-08-17 10:34:39 -04:00
Anuken 43fae3b9e3 Fixed #7382 2022-08-17 10:34:34 -04:00
ManuWar73andGitHub 5a2ba71198 Spanish translation for v7: 2 try (#7378) 
Translated everything that isn't and should be translated
 2022-08-16 17:22:23 -04:00
Anuken a7f939de4c Misc balance 2022-08-16 09:13:22 -04:00
Anuken f9ba1c3e04 Merge remote-tracking branch 'origin/master' 2022-08-16 07:24:00 -04:00
Anuken a8b8028835 Hide Erekir resources on Serpulo loadout 2022-08-16 07:23:55 -04:00
Github Actions b312459b6f Automatic bundle update 2022-08-16 02:35:09 +00:00
Angel-24GitHubAnuken
 		dff0a8294e Update bundle_es.properties (#7191) 
* Update bundle_es.properties

* Update bundle_es.properties

* Update bundle_es.properties

I just realized the line which said "Don't translate them yet!"

* Update bundle_es.properties

* Update bundle_es.properties

* typo

* "Blast drill" => "Taladro de voladura"

@Vdoble's reported an issue related to a duplicated block name.

Co-authored-by: Anuken <arnukren@gmail.com>
 2022-08-15 22:33:31 -04:00
Github Actions 03accce8f2 Automatic bundle update 2022-08-15 21:43:21 +00:00
彭瑞暄andGitHub 1f57332091 Update bundle_zh_TW.properties (#7360) 
lcategory pending
 2022-08-15 17:41:46 -04:00
Thomas WidyantokoandGitHub 287ccf7e84 Update bundle_id_ID.properties (#7361) 
openable links, search function, viewing player
 2022-08-15 17:41:37 -04:00
Joan JosepandGitHub fd70598476 Update bundle_ca.properties (#7375) 2022-08-15 17:41:14 -04:00
Anuken ec8e48f3f5 Metaglass cyclone buff 2022-08-15 17:14:14 -04:00
K0baUandGitHub fe1d81b4d5 Update bundle_ja.properties (#7369) 
* Update bundle_ja.properties

* Update bundle_ja.properties
 2022-08-15 06:59:37 -04:00
BlackDeluxeCatandGitHub 6842daf8fb Fixed duct unloader works with core-linked storage (#7367) 2022-08-15 06:59:11 -04:00
Anuken b88b5fa32a Merge remote-tracking branch 'origin/master' 2022-08-14 15:40:01 -04:00
Anuken f15a620c45 Allow neoplasm on water/arkycite/etc 2022-08-14 15:39:56 -04:00
Github Actions 522070be4b Automatic bundle update 2022-08-13 17:54:18 +00:00
PhinnerGitHubAnuken
 		4030acbd75 Allow servers to send openable links to players (#7351) 
* commitin'

* Update core/assets/bundles/bundle.properties

Co-authored-by: Anuken <arnukren@gmail.com>

* Update bundle_fr.properties

* s p a c e

Co-authored-by: Anuken <arnukren@gmail.com>
 2022-08-13 13:52:46 -04:00
Anuken 1f318306a7 Merge remote-tracking branch 'origin/master' 2022-08-13 10:56:24 -04:00
Anuken dbabb07528 Gradle 7.5.1 2022-08-13 10:56:19 -04:00
MEEPofFaithandGitHub 25388ffe5f Better Duplicate Op Support (json/hjson) + 1 more op (#7355) 
* Better support for duplicate ops

* 'Mathf.curve' op
 2022-08-13 06:52:46 -04:00
Joan JosepandGitHub 8132e1f3aa Update bundle_ca.properties. Change verbal periphrases and apostrophe symbol. (#7332) 2022-08-12 10:46:08 -04:00
Github Actions 1d43e16261 Automatic bundle update 2022-08-12 11:44:46 +00:00
PhinnerandGitHub 935d096b26 French Translation: The return (#7086) 
* yes

* yes 2

* hortisquash and the seven translations

* smol fixes

* y e s
 2022-08-12 07:43:38 -04:00
Github Actions f3154d606b Automatic bundle update 2022-08-11 16:07:20 +00:00
Anuken 8cac2939b3 Merge remote-tracking branch 'origin/master' 2022-08-11 12:06:18 -04:00
Anuken 06e08c1074 Compact player list 2022-08-11 12:06:14 -04:00
Github Actions 2f7a646e2b Automatic bundle update 2022-08-11 15:37:24 +00:00
LunaandGitHub e28dbfad69 Community server search (#7305) 
* basic community server search

* normalise capitalisation

* localise "Search:"
 2022-08-11 11:36:10 -04:00
Anuken 1a85c85a22 Fixed assembler module input edge sprite 2022-08-11 10:44:11 -04:00
Anuken e4c6822cca JSON payload stack support 2022-08-11 08:43:58 -04:00
MEEPofFaithandGitHub 3f96799c2e Make PayloadAmmoTurret accept units (#7320) 2022-08-11 08:38:45 -04:00
Lucky CloverandGitHub b3f43dbc03 worldCell.targetable = false (#7345) 2022-08-11 07:23:11 -04:00
MEEPofFaithandGitHub 3fc0957197 Shielded wall shield size (#7343) 2022-08-10 14:52:20 -04:00
Epowerj ce8d51e18e Work on peaks 2022-08-10 10:52:59 -04:00
BlackDeluxeCatandGitHub 5e63b89f4f Fixed ucontrol approach not applied to ground units (#7340) 2022-08-10 08:06:12 -04:00
Github Actions 44af0bc08b Automatic bundle update 2022-08-10 02:51:16 +00:00
ThatOneBepisandGitHub 0fa21ce165 Previous "update bundle_sr.properties" but no Sine shenanigans (#7333) 
* Update bundle_sr.properties

* ln but with angles

* rollback

* you saw nothing
 2022-08-09 22:50:14 -04:00
Epowerj 648a4b5e61 Tweaked tech tree for peaks 2022-08-09 19:45:51 -04:00
Epowerj 1d25b9e0bc Merge branch 'master' of https://github.com/Anuken/Mindustry into maps_phase_2 2022-08-09 18:57:26 -04:00
Epowerj bc38d71f98 Progress on peaks 2022-08-09 16:52:36 -04:00
Epowerj 9f9e854c5f Progress on peaks 2022-08-09 16:47:13 -04:00
Github Actions 75b5efd5e2 Automatic bundle update 2022-08-09 20:03:27 +00:00
NuntingandGitHub a31175377a Update bundle_ko.properties (#7307) 
* Update bundle_ko.properties

Unification of reactor terms. 
원자로 -> 반응로 통일. 같은 의미이지만 어감이 다름.

Added detailed description of parallax for beginners. This is not official and can be removed at any time.
초보자를 위한 패럴랙스 디테일 추가. 공식 설명이 아니므로 제거될 수 있음.

* Update bundle_ko.properties

토륨/핵융합 반응로->원자로로 복원
 2022-08-09 16:02:28 -04:00
SUSandGitHub f01278cf72 Update bundle_uk_UA.properties (#7318) 
* Update bundle_uk_UA.properties

Yesn't

* Update bundle_uk_UA.properties

Yay new update)

* Update bundle_uk_UA.properties

Start...

* Update bundle_uk_UA.properties

1

* Update bundle_uk_UA.properties

2

* Update bundle_uk_UA.properties

3.1

* Update bundle_uk_UA.properties

4

* Update bundle_uk_UA.properties

5

* Update bundle_uk_UA.properties

6

* Update bundle_uk_UA.properties

7

* Update bundle_uk_UA.properties

8

* Update bundle_uk_UA.properties

Finally (I'm waiting)
 2022-08-09 16:02:19 -04:00
Epowerj 43937db6df Added peaks to tech tree 2022-08-09 15:50:45 -04:00
Epowerj 63cf6f6fb2 Reduced breach tungsten damage 2022-08-09 15:49:51 -04:00
Epowerj 2344cc442b Added peaks to code 2022-08-09 15:47:43 -04:00
Epowerj 48cb99774a Added peaks 2022-08-09 15:46:32 -04:00