mirrors/Mindustry
1
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2026-01-26 06:22:17 -08:00
Code Issues Projects Releases Wiki Activity
15911 commits 3 branches 175 tags 2.4 GiB
Commit graph

15911 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
MEEPofFaith
9af9e1459d
Fix only 1 ammoType displaying with missile units (#8020) 2023-01-07 11:37:39 -05:00
Anuken
4d77a6d475 Merge remote-tracking branch 'origin/master' 2023-01-07 11:36:52 -05:00
Anuken
64a9377006 #8040 but better 2023-01-07 11:36:48 -05:00
Garen7
c20d7f2b4f
Fixes the damage modifier not working sometimes (#8124) 
Co-authored-by: Garen7 <Garen7@users.noreply.github.com>
 2023-01-07 11:30:49 -05:00
Garen7
b57cde7148
Fixes polies helping the enemy team in pvp (#8056) 
Co-authored-by: Garen7 <Garen7@users.noreply.github.com>
 2023-01-07 11:29:46 -05:00
buthed010203
a5fd29e56d
Fix crash when toString returns null value (#8067) 
* Fix crash when toString returns null value

* Return a string from NullUnit toString

* Begone redundancy

* Unwrap before null check to ensure non-nullability
 2023-01-07 11:28:01 -05:00
Anuken
c0b819ec9b Fixed #7952 2023-01-07 11:27:15 -05:00
Anuken
30e36d5640 Merge remote-tracking branch 'origin/master' 2023-01-07 11:24:02 -05:00
Anuken
0582ba1c47 Oct now has an octagon shield 2023-01-07 11:23:55 -05:00
Epowerj
141902d012
Merge pull request #8085 from xem8k5/patch-24 
Update v7 Server list // server lists cleaned up
 2022-12-29 01:08:02 -05:00
xem8k5
fd5b8a32a1
Update servers_v7.json 2022-12-25 17:27:38 +08:00
Epowerj
fc91cf6d44
Merge pull request #7957 from Brandons404/master 
Update v7 Server list | changed hosts for one of my servers
 2022-12-23 18:51:00 -05:00
Epowerj
a5de521e6e
Merge pull request #7991 from Darkness6030/patch-1 
darkdustry.tk -> darkdustry.net
 2022-12-22 02:35:43 -05:00
Anuken
243c50be02 Faster entity removal 2022-12-14 16:58:58 -05:00
Даркнесс#3729
c601114a43
darkdustry.tk -> darkdustry.net 
Also added a new gamemode: https://github.com/xzxadixzx/hex-industry
 2022-11-24 20:48:10 +03:00
Recessive
0fcab7db62
Added AA Plague to V7 server list (#7913) 
Will update the server to V7 once the PR is accepted. For now I'll leave it as V6 so the few players who haven't updated have something to play
 2022-11-20 00:16:20 -05:00
Brandons404
b89a5ff3b5 changed hosts for one of my servers 2022-11-19 12:07:15 -06:00
Epowerj
1180764dab Fixed some weird issues on stronghold 2022-11-16 14:40:47 -05:00
Anuken
7f292b14a7 Merge remote-tracking branch 'origin/master' 2022-11-13 13:26:23 -05:00
Anuken
f7f3d5bde3 Revert hold time 2022-11-13 13:26:19 -05:00
Github Actions
f400ccc66a Automatic bundle update 2022-11-13 16:14:54 +00:00
Anuken
3a4a37cf0c Fixed mod version requirement text missing 2022-11-13 11:14:04 -05:00
Anuken
42af4e6b7e Merge remote-tracking branch 'origin/master' 2022-11-13 10:26:45 -05:00
Anuken
f4e90bfb6b Crash fix 2022-11-13 10:26:40 -05:00
Github Actions
4f912f25ee Automatic bundle update 2022-11-13 15:05:50 +00:00
Slotterleet
3ca68e426c
[RU] Fixed typos and new translations (#7897) 
* [RU] Fixed typos and new translations

* One. Single. Typo.

* New Onset objective
 2022-11-13 10:05:14 -05:00
Joan Josep
20f8fd79ff
Update bundle_ca.properties (#7907) 
Co-authored-by: Anuken <arnukren@gmail.com>
 2022-11-13 10:04:54 -05:00
VaporSpace2
a101f21de0
remove Generic survival sever from v6 server list (#7903) 
updated server to v7
 2022-11-13 09:59:29 -05:00
VaporSpace2
509760eeb1
add generic survival server to v7 server list (#7904) 
process of updating generic survival server
 2022-11-13 09:59:22 -05:00
OpalSoPL
d4a7b49233
Update bundle_pl.properties (#7891) 
small change in translation (line 1811 only)
 2022-11-13 09:58:51 -05:00
Nunting
0db2e40e27
Update bundle_ko.properties (#7889) 2022-11-13 09:58:44 -05:00
SoMall-dumpling
6a8fe28e70
Update bundle_zh_CN.properties (#7888) 
* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties
 2022-11-13 09:58:34 -05:00
Angel-24
23067674c9
Update bundle_es.properties (#7848) 2022-11-13 09:58:24 -05:00
Volas171
7b3f5d3848
Update servers_v7.json (#7905) 2022-11-13 09:58:18 -05:00
Anuken
b422e041f4 Fixed #7906 2022-11-13 09:57:09 -05:00