mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-24 09:56:32 +07:00
Code Issues Packages Projects Releases Wiki Activity
10,702 Commits 4 Branches 160 Tags 2.3 GiB
9f8fce72d3
Commit Graph

9075 Commits

Author SHA1 Message Date
Anuken
9f8fce72d3 Better build beam visuals 2020-12-25 21:49:10 -05:00
Anuken
834e4f175b Fixed #4122 2020-12-25 15:56:53 -05:00
Anuken
bba52e99e0 Fixed #4121 2020-12-25 12:34:02 -05:00
Anuken
4339042078 Fixed #4120 2020-12-25 10:57:54 -05:00
Anuken
f86291c587 Merge remote-tracking branch 'origin/master' 2020-12-25 01:26:24 -05:00
Anuken
da96b23441 Higher power source output 2020-12-25 01:26:20 -05:00
彭瑞暄
d2ae9cf809
Up-to-date zh-TW translations (#4083) 
* Update bundle_zh_TW.properties

Corrected some machine translations. Modified some others for more clear understanding.

* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties

new translations 1

* Update bundle_zh_TW.properties

New translations 2

* Update bundle_zh_TW.properties

New translations 3

* New translations 1-3

Removed "zones" from v121.4: "Fixed sectors not auto-unlocking".
衝擊反應堆 -->動能反應爐

* New translations 1-4

* New translations 1-5

* New translations 1-6

up to line 1250

* Indexing finished. Translations 1-7

lines are now matching with English bundle.

* update bundle_zh_TW.properties

* edit zh_TW

* zh-tw

* community server disclaimer

* Finished sector descriptions, slight modifications

up to line 606

* zh-TW

* Many translations, include Always-on weather rule

* corrected missing character

* Update achievements.vdf

Oct not translated

* Update description.txt

* bundle_zh_TW.properties

* Bullet stats update, hints finished

* added line: public confirm really

* contributors

* Merging conflicts

Almost done...

* Synced

* Update ammo-stat translation

* Update contributors

* Unit names

* Update bundle_zh_TW.properties

* Unit names

* Update bundle_zh_TW.properties

* Review (#15)

* Update bundle_zh_TW.properties

* Unit names

* Update bundle_zh_TW.properties

* Finished

Please review

* minor correction

* minor correction

Hopefully there are no more "minor corrections" required.

* Review

* Close inspection

* Revisions, change chat mode

* Sapping Correction

Co-authored-by: simba-fs <simba.fs@gmail.com>
Co-authored-by: Simba-Fs <39305460+simba-fs@users.noreply.github.com>
 2020-12-25 00:03:35 -05:00
Sunny Kim
beed2e0b8f
Block Forge improvements (#4112) 
* minBlockSize, maxBlockSize, icon

* removed fixed size

* same line

* revert to 3

* I almost forgot
 2020-12-25 00:02:15 -05:00
Anuken
eda6770e11 Fixed mined item flashing on clients 2020-12-24 23:17:35 -05:00
Antsiferov Andrew
43757a247e
[QoL] Chat modes (#3869) 
Credits: Remint32 (idea); sk7725 (korean i18n); Volas171 (spanish i18n).
 2020-12-24 16:05:41 -05:00
Anuken
1e8621d9d4 Merge remote-tracking branch 'origin/master' 2020-12-24 11:43:08 -05:00
Anuken
0940abe98c Fixed #4108 2020-12-24 11:43:04 -05:00
younggam
4a71564d03
mod version check fix (#4100) 
* Update Version.java

* Update contributors
 2020-12-24 10:36:55 -05:00
Patrick 'Quezler' Mounier
9397bd57c4
Prevents plastanium conveyor unload exploit (#4098) 
* Prevent unloaders from unloading plast loading dock

* Use overridable boolean method unloadable instead

* unloadable -> canUnload
 2020-12-24 10:33:40 -05:00
Patrick 'Quezler' Mounier
85a668c202
Prevent visual plastanium conveyor glitch when disabled (#4101) 2020-12-24 09:47:43 -05:00
Anuken
90372171b2 Fixed #4104 2020-12-24 09:44:24 -05:00
Anuken
f5c270347c Version parse fix 2020-12-23 14:37:39 -05:00
Anuken
a21cc32be9 Marked mod browser as WIP 2020-12-23 12:33:56 -05:00
Anuken
06f832bfae Merge remote-tracking branch 'origin/master' 2020-12-23 12:21:41 -05:00
Anuken
79423e4c60 Mod browser initial implementation 2020-12-23 12:21:25 -05:00
Catchears
c92f662994
german translation (#3726) 
* german achievement translation

* typo

* change from Ordoviz

* typos

* duzen statt siezen

* update bundle
 2020-12-23 12:10:35 -05:00
Anuken
8ac027af70 More browser cleanup 2020-12-23 12:03:43 -05:00
YellOw139
15b865e550
[Bundle][RO] Translation update (#4039) 
* [Bundle][RO] Translation update

This PR was tested in-game and is _**ready to merge at any time**_ (unless marked as draft).

Changelog:
- New strings/changes up to commit commit
- Typo fixes & various other improvements

* don't do bad choices

* some polishing

* typo

* The 7.0 [combat] experience

* Rebranding
 2020-12-23 12:02:37 -05:00
Patrick 'Quezler' Mounier
1e7e66c424
Rename existing Power Infinite with Power Source (#4090) 2020-12-23 12:02:28 -05:00
Felix Corvus
0524447c78
[Bundle][RU] actual L10n (#3680) 
* 1 line changed

- noname

* 1 line changed

- hint.placeTurret

* 3 new lines

- servers.disclaimer
- hint.coreUpgrade
- hint.presetLaunch

----
NOTE from Felix Corvus (@Remint32)

This commit and PR are the last ones I made to the repository.
I want to sincerely thank the people I worked with to enhance the game and translate it into Russian.

I want to thank you separately:
Prosta4ok_ua (@Prosta4okua), Vanguard (@XEN0PHIL), BasedUser (@BasedUser), Summet (@summetdev), Anuke (@Anuken), The_Slaylord (@TheSlaylord), Lonely_Ymomfe (@ymomfe), and XZimur (@XZimur)

* 5 changed lines; 2 new lines

Changed:
globalitems
sector.extractionOutpost.description
hint.launch
hint.launch.mobile
hint.presetLaunch

New:
hint.coreIncinerate
hint.coopCampaign

* 2 changed line

hint.coopCampaign
item.spore-pod.details
-
В споровом стручке всё же множественное число в описании, говорится про сами споры. THEY EMIT - они выделяют, IT EMITS - он выделяет.

* 2 changed lines

hint.coreIncinerate
block.interplanetary-accelerator.description

* 3 new line; 1 changed line

New:
setting.showweather.name
link.bug.description
rules.weather.always

Changed:
keybinds.mobile

* 4 new lines; 1 changed line; 1 deleted line

New:
public.confirm.really
bullet.buildingdamage
stat.ammouse
unit.pershot

Changed:
bullet.knockback

Deleted:
bar.limitreached

* Update bundle_ru.properties

падежи

* Update bundle_ru.properties

мелочи

* 1 changed line

stat.ammouse

Co-authored-by: Vanguard <55051135+XEN0PHIL@users.noreply.github.com>
 2020-12-23 11:56:33 -05:00
Anuken
b6f1b67b24 Merge branch 'master' into ThePythonGuy3-patch-1 2020-12-23 10:51:56 -05:00
Anuken
715d94967e Cleanup 2020-12-23 10:51:24 -05:00
MEEP of Faith
a21f79ac6a
Draw size independent from puddle size. (#3826) 
* Draw size independent from puddle size.

* Apply change to Bullets
 2020-12-23 10:29:26 -05:00
Sunny Kim
986caa857e
public SettingsTables for mod settings (#4085) 2020-12-23 09:41:43 -05:00
Sunny Kim
1a14860b62
bump editor only blocks foward (#4084) 2020-12-23 09:40:00 -05:00
Patrick 'Quezler' Mounier
d144e9c91c
Allow plastanium conveyor to be unloaded (#4087) 2020-12-23 09:39:29 -05:00
Patrick 'Quezler' Mounier
9d740e1e37
Rebrand power infinite as power source (#4088) 2020-12-23 09:39:04 -05:00
Anuken
71488313e1 Fixed #4082 2020-12-22 20:13:34 -05:00
Anuken
a44f3c379f Ammo/shot display 2020-12-22 15:10:48 -05:00
Anuken
f3d5cb315e Cleanup 2020-12-22 13:51:11 -05:00
Anuken
d3f99105b2 Merge remote-tracking branch 'origin/master' 2020-12-22 13:42:01 -05:00
Anuken
7f49f0c6fa Fixed #4079 2020-12-22 13:41:54 -05:00
Anuken
ceb298ca0b cleanup 2020-12-22 12:52:01 -05:00
VozDuh
0aaa77a5ea
Scrap Walls Textures Cleanup (#4074) 2020-12-22 11:31:24 -05:00
Sunny Kim
79d4925761
THIS WAS WHAT IT WAS ALL ALONG (#4069) 2020-12-22 11:30:09 -05:00
Anuken
7ea12e97ec Fixed #4073 2020-12-22 11:28:33 -05:00
Anuken
8521d5cd1b Merge remote-tracking branch 'origin/master' 2020-12-22 11:20:43 -05:00
Anuken
17177f87aa Fixed #4071 2020-12-22 11:20:35 -05:00
Anuken
24c71e49c7 cleanup 2020-12-22 10:48:11 -05:00
Skybbles
ac06fa8f96
update my github name (#4070) 
updating my name here since I changed my username
 2020-12-22 10:33:07 -05:00
Anuken
eda134a18c Merge remote-tracking branch 'origin/master' 2020-12-21 20:48:07 -05:00
Anuken
852013cd63 #4068 2020-12-21 20:48:00 -05:00
Sunny Kim
5b163d7843
Heat for accelerator (#4065) 
* heat

* better animations
 2020-12-21 20:04:04 -05:00
Anuken
806cea4b33 Added building damage to bullet stats 2020-12-21 16:55:04 -05:00
Anuken
952639a72e Merge branch 'master' of https://github.com/Anuken/Mindustry 2020-12-21 13:10:00 -05:00