mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-10 15:19:24 +07:00
Code Issues Packages Projects Releases Wiki Activity
15,946 Commits 4 Branches 160 Tags 2.1 GiB
56ed932716
Commit Graph

15946 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken
56ed932716 Merge remote-tracking branch 'origin/master' 2023-01-07 15:07:57 -05:00
Anuken
4c09f6dd40 Fixed #8025 2023-01-07 15:07:54 -05:00
Phinner
700e4564a8
Update Xpdustry V7 servers (#7977) 
* update servers

* more...

* Add lobby server
 2023-01-07 14:54:34 -05:00
Anuken
f1e1eb1015 Fixed #8015 2023-01-07 14:54:15 -05:00
Anuken
963b96a1fb Merge remote-tracking branch 'origin/master' 2023-01-07 14:47:14 -05:00
Anuken
87786441ff Fixed #8117 2023-01-07 14:47:10 -05:00
Anuken
05dec4df6a Fixed #8117 2023-01-07 14:46:31 -05:00
MEEPofFaith
a3270debac
Fix collideLine (#8037) 2023-01-07 14:46:19 -05:00
Github Actions
cf392d13ed Automatic bundle update 2023-01-07 19:43:14 +00:00
Prosta4okua
574a10e5f8
🍉🍉🍉 Watermelons have deployed. Prepare yourself for new Ukrainian translation for v7 release (#7885) 
* hehe

* Finished translation. Need to proofread. Added 2 missing entries.

* Fixes

* Fixes #2

* Added button Random to translations and fixed error

* Fixes from @1stvaliduser

* fixes

* fixes

* будівль -> будівель
 2023-01-07 14:42:27 -05:00
Anuken
eb410af371 sandbox is now actually sandbox again 2023-01-07 14:41:12 -05:00
Anuken
542bf2b413 Fixed #8084 2023-01-07 14:26:25 -05:00
Anuken
723b10af57 Fixed #7944 2023-01-07 14:18:07 -05:00
Anuken
1394c49e48 Fixed #8008 2023-01-07 14:10:41 -05:00
Anuken
d8ecdff698 Merge remote-tracking branch 'origin/master' 2023-01-07 14:01:33 -05:00
Anuken
2a71f4620e Fixed #7962 2023-01-07 14:01:28 -05:00
Slotterleet
fe99c7da62
Update bundle_ru.properties (#7973) 2023-01-07 14:00:32 -05:00
Anuken
0b00747f29 Merge remote-tracking branch 'origin/master' 2023-01-07 13:53:07 -05:00
Anuken
ae4a41cd0b Fixed #8042 2023-01-07 13:53:03 -05:00
GlennFolker
93f630bb69
Make custom Env flag reliably possible (#8019) 
* Make custom Env flag reliably possible

* screw you

* "compatibility" for mods that don't use add()
 2023-01-07 13:48:28 -05:00
Anuken
d7d5ba7510 Fixed #8060 2023-01-07 13:44:34 -05:00
Anuken
e846084942 Merge remote-tracking branch 'origin/master' 2023-01-07 13:42:48 -05:00
Anuken
a15b887e5c Fixed #8011 2023-01-07 13:42:43 -05:00
Github Actions
4e51586b3b Automatic bundle update 2023-01-07 18:23:43 +00:00
Phinner
d3a90d68d1
Update bundle_fr.properties (reopen of #7883) (#7918) 
* pull #7883

* add new translations

* add these fine gentlemen to the contributors

* bateau -> vaisseau

* forgor again 💀
 2023-01-07 13:22:58 -05:00
Github Actions
78973d3f12 Automatic bundle update 2023-01-07 18:17:21 +00:00
Anuken
c37ad9210a Merge remote-tracking branch 'origin/master' 2023-01-07 13:15:59 -05:00
Anuken
246591eab4 Fixed #8119 2023-01-07 13:15:56 -05:00
MEEPofFaith
eb0481a1da
Cargo units *will* chase you down if you pick up their target. (#8033) 2023-01-07 12:55:19 -05:00
Garen7
ba72e9c50d
Fixes Tanks rotating needlessly after attack commands (#8112) 
Co-authored-by: Garen7 <Garen7@users.noreply.github.com>
 2023-01-07 12:54:26 -05:00
Anuken
54a9955e30 #8126 2023-01-07 12:44:29 -05:00
Anuken
49bcbafdaa Fixed #7946 2023-01-07 12:39:12 -05:00
Anuken
b4137dca6e Fixed #7978 2023-01-07 12:37:37 -05:00
Anuken
98f869ecea Fixed #8086 / Fixed #8065 2023-01-07 12:15:37 -05:00
Anuken
0c9f2b2687 Fixed #8092 2023-01-07 12:06:57 -05:00
Anuken
4ec4e83823 Fixed #7932 2023-01-07 12:04:36 -05:00
Anuken
96477f7ff5 Merge remote-tracking branch 'origin/master' 2023-01-07 12:03:58 -05:00
Anuken
1236e8d342 Fixed #7922 2023-01-07 12:03:54 -05:00
MEEPofFaith
47353cc808
Power icon (#7901) 
* Power icon

* Less yellow yelloow
 2023-01-07 11:49:59 -05:00
MEEPofFaith
6eadac38b7
placeEffect (#7968) 2023-01-07 11:46:14 -05:00
whert-dev
0d26b9e4f8
Added angleOffset to DrawPistons (#7950) 2023-01-07 11:45:33 -05:00
Garen7
cb5351419b
Updates android Readme and Gradle (#7942) 
Co-authored-by: Garen7 <Garen7@users.noreply.github.com>
 2023-01-07 11:45:25 -05:00
Nunting
eb9b0f69bb
Update bundle_ko.properties (#7992) 2023-01-07 11:44:25 -05:00
Zelaux
2c103c157a
Fixed boolean setters for Structs (#8041) 2023-01-07 11:44:08 -05:00
Garen7
a3a071e520
Additional block build over options (#7993) 
* Adds missing block groups

* Allows electrolyzers to be rotated by bulding over them too

Co-authored-by: Garen7 <Garen7@users.noreply.github.com>
 2023-01-07 11:43:23 -05:00
MEEPofFaith
5af8236643
Move beam drill facing update (Fix minor graphical glitch) (#8004) 
* move beam drill facing update

* Add updateFacing back to updateTile

* Stop consuming if not drilling anything.
 2023-01-07 11:43:07 -05:00
Github Actions
bf07deafc6 Automatic bundle update 2023-01-07 16:40:17 +00:00
kituta
2809a083a0
Update bundle_ja.properties (#8006) 
* Update bundle_ja.properties

一部を翻訳 // Translated in part.

1244 Factions 派閥ではなくチームでも良いかもしれません

* Update bundle_ja.properties

セクター名と説明文 //Sector Name and Description
ブロックの説明文 //Block Description

* Update bundle_ja.properties

Jun 3, 2021 Partial 7.0 merge - API preview から Nov 14, 2022 Revert hold time までの原語版の追記変更を適用しました。//Applied changes additions from Jun 3, 2021 to Nov 14, 2022.
チュートリアル、現在目標(左上)、ユニット説明文などを翻訳//Translated tutorial text, current target text (upper left), unit description, etc.

* Update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

セルプロの説明文を原語版に合わせました。 // The description of Serpulo has been adapted to the original language version.
語句の変更 // Changed a word or phrase.

「依存関係」を「前提Mod」にしました。

* Update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

ブロックの説明文を整理しました。 // Organized block descriptions.

* Update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

Don't translate these yet! だったので戻しました。// Since it was "Don't translate these yet!", I returned the corresponding text.

* Update bundle_ja.properties

翻訳の追加と微修正 // Translations were added and minor corrections were made.

* Update bundle_ja.properties

脱字を修正 // Fixed a typo

* Update bundle_ja.properties

表記ゆれの統一 // Uniformity of notation

* Update bundle_ja.properties

* Update bundle_ja.properties

誤字の修正 // Correction of typos
 2023-01-07 11:39:31 -05:00
end-me-please
b18fd82a21
Update LogicBlock.java (#8032) 2023-01-07 11:39:05 -05:00
null
9dcb8b7bd5
yay more hardcoded regions (#8021) 
* change fuckall

* more of this

* typo
 2023-01-07 11:38:12 -05:00