Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,011 Commits 4 Branches 180 Tags
70cf55f31408dff86d62e2cd3fb583d32e6a9ef1
Commit Graph

13011 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken
83854169b7 Fixed #5412 2021-06-11 08:51:34 -04:00
Anuken
31ebb1d156 Planet progress 2021-06-10 20:46:10 -04:00
Anuken
f99b8e35bd Testing single-sector planets 2021-06-10 19:55:06 -04:00
Anuken
9e8e0709b5 Merge 2021-06-10 18:51:49 -04:00
Anuken
dfd2b22917 Planet method renaming 2021-06-10 18:51:29 -04:00
Anuken
c4803d29da Pulverizer texture cleanup 2021-06-10 16:14:53 -04:00
VozDuh
a0acf1a040 Melter & Pulverizer Fixed (#5098) 
Co-authored-by: Anuken <arnukren@gmail.com>
 2021-06-10 16:01:04 -04:00
Anuken
8d9d6385f9 Editor variant regions for wall blocks 2021-06-10 15:52:33 -04:00
MEEP of Faith
af2830602d Let any block have variants. (#5372) 2021-06-10 15:42:01 -04:00
Anuken
e4bd3fab7c Removed MetalFloor class 2021-06-10 15:39:43 -04:00
Anuken
e3ea1bdaae Merge remote-tracking branch 'origin/master' 2021-06-10 15:10:56 -04:00
Anuken
a180aae838 Blending cleanup / Misc bugfixes 2021-06-10 15:10:52 -04:00
ulwepo
abcea8dd39 Update servers_v6.json (#5407) 
This is Japanese server.
Add a survival server and a sandbox server.
Thank you
 2021-06-10 09:35:44 -04:00
Anuken
448604062d Merge remote-tracking branch 'origin/master' 2021-06-10 09:32:05 -04:00
Anuken
bcdbca7337 Fixed #5410 2021-06-10 09:32:01 -04:00
Anuken
dd500a747b Update deployment.yml 2021-06-10 09:06:05 -04:00
Anuken
32d8f59b5a Merge remote-tracking branch 'origin/master' 2021-06-10 09:04:06 -04:00
Anuken
86bf068ac3 Fixed #5406 2021-06-10 09:03:57 -04:00
Anuken
ec2c273c97 Add an automatic item produce requirement 2021-06-09 22:55:48 -04:00
Anuken
35be671d86 Planet constructor tweaks 2021-06-09 22:18:54 -04:00
Anuken
1ce6772601 Merge 2021-06-09 17:15:22 -04:00
Anuken
8c32c00e2b Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/content/Blocks.java
 2021-06-09 17:10:49 -04:00
Romanin
a587477fc0 Renamed the category and added it easyplay.su (#5405) 
We decided to rename the category in order to add to it EasyPlay.Su (we have an agreement)
 2021-06-09 17:09:54 -04:00
Anuken
e3da0f713e Modded techtree bugfixes 2021-06-09 16:15:17 -04:00
Anuken
6f609aa4ee ConsumeCoolant 2021-06-09 14:38:49 -04:00
Anuken
c9ff84d03b Test fix 2021-06-09 14:03:29 -04:00
Anuken
b04c04f69f New metal floor / Selective floor attribute stats 2021-06-09 13:26:01 -04:00
Anuken
adf6465029 Child-first mod class loading 2021-06-09 10:04:23 -04:00
Anuken
a8a163ebe2 Fixed Android builds 2021-06-09 08:57:56 -04:00
Anuken
7dcfd648f7 Minor bugfixes 2021-06-09 08:37:26 -04:00
Anuken
1895c7b8e0 Updated Rhino 2021-06-09 08:32:09 -04:00
Anuken
91c0235ff5 #5402 2021-06-08 22:07:45 -04:00
Anuken
25b2458a92 Merge remote-tracking branch 'origin/master' 2021-06-08 21:59:01 -04:00
Anuken
28203ca6e9 Fixed regression introduced in #5361 2021-06-08 21:58:56 -04:00
MEEP of Faith
93fd3c6e18 Allow weapons on Miner units to function. (#5398) 
`target` shouldn't affect anything because it is unused in `updateMovement()`
 2021-06-08 14:05:56 -04:00
Anuken
95da46bfa2 Duct bridge input display 2021-06-08 11:49:55 -04:00
Catchears
8c1702cff5 Initial german translation for v7 (#5394) 
* initial v7 translations

* forgot unsupported.environment

* resolve the duct issues
 2021-06-08 10:20:00 -04:00
Anuken
8962992ef9 Fixed invalid healing effects 2021-06-08 09:14:54 -04:00
Anuken
a7de30ba53 RidgedPerlin cleanup / More river noise options 2021-06-07 20:38:17 -04:00
Anuken
2651a30f79 Merge remote-tracking branch 'origin/master' 2021-06-07 18:07:41 -04:00
Anuken
1c9589eb26 Editor filter bugfixes 2021-06-07 18:07:37 -04:00
SaltyBeggarBR
850ebe8156 Brazillian Portuguese translation huge revamp (bundle_pt_BR.properties changes) (#5395) 
I changed a few things that were either translated wrong, had typos or just sounded weird and also added a lot of stuff that didn't have translation yet, like the new blocks.

I tested the changed bundle as a mod by simply saving the edited bundle text on the test mod folder, but I believe it should also work when merged into the source code, and also because it's something that is pretty simple.

Not everything is translated yet, logic commands and its tips still have to be translated. I believe some other stuff also doesn't have a translation, since I didn't do a general revision of the game to see that, although I believe almost everything should be translated now.

(for Brazillians):
Eu mudei algumas coisas que estavam ou erradas, tinham erros de português ou simplesmente soavam estranhas e também adicionei um monte de coisa que ainda não estava traduzida.

o bundle modificado foi testado como um mod simplesmente salvando o arquivo de texto modificado na pasta do mod de teste, mas acredito que também vá funcionar certinho quando colocado no código fonte em si até porque é algo simples.

Não é tudo que foi traduzido ainda, lógica e suas dicas ainda tem que ser traduzidas. Acredito que outras coisas também, foi não fiz uma revisão geral no jogo em português para saber, mas acredito que a maioria deve de estar traduzido agora
 2021-06-07 18:05:19 -04:00
YellOw139
8a51a4be32 [Bundle][RO] Update (v7 pre-alpha) (#5365) 
* [Bundle][RO] Update (v7 pre-alpha)

Changelog:

- New strings/changes up to commit 00ca247d0f
- Typo fixes & various other improvements

* old typo

* coolant strength
 2021-06-07 16:40:07 -04:00
Anuken
a452cd94c6 arc 2021-06-07 15:25:56 -04:00
Anuken
0966b49ff7 Merge remote-tracking branch 'origin/master' 2021-06-07 15:04:57 -04:00
Anuken
0582cfac2b Prefer Team#data() for team data 2021-06-07 15:04:45 -04:00
IchHabeKeineNamen
5deb8a879e Update BlockRenderer.java (#5259) 
1. Ensure consistency of code.
1. Make the code straightforward.
 2021-06-07 15:00:31 -04:00
Anuken
f4db208d75 Merge remote-tracking branch 'origin/master' 2021-06-07 14:55:18 -04:00
Anuken
f73c49b246 Moved effect calls back to correct class 2021-06-07 14:55:14 -04:00
shift
93a197e7d9 [RU] Fix interplanetary accelerator description (#5392) 
* [RU] Fix interplanetary accelerator description

Made it same as it's name

* Make translate close to original
 2021-06-07 14:51:05 -04:00