mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-02 04:13:44 +07:00
Code Issues Packages Projects Releases Wiki Activity
12,626 Commits 4 Branches 160 Tags 2.3 GiB
fc9abeb908
Commit Graph

12626 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
VizardAlpha
fc9abeb908
Update bundle_fr.properties (#6172) 
* Update bundle_fr.properties

More branch merging.. Commits and more..

* Added logic variable display window
 2021-10-17 15:23:59 -04:00
Prosta4okua
ea3802bfc7
Update bundle_uk_UA.properties (#6180) 
* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties
 2021-10-17 15:23:50 -04:00
Anuken
994f6f7e84 Redundant codegen cleanup 2021-10-17 15:21:41 -04:00
Anuken
ba91fb8eb7 Bugfixes 2021-10-17 15:14:19 -04:00
Anuken
e6d7330f6e Fixed #6182 2021-10-17 15:01:29 -04:00
Anuken
be1561b0cb Don't allow constructing banned blocks 2021-10-16 23:17:54 -04:00
Anuken
b271f5b630 Fixed #6174 2021-10-16 23:06:07 -04:00
Anuken
d5a2f13442 Payload loader tweaks 2021-10-16 22:33:17 -04:00
Anuken
f03d3d89f3 Fixed large units fitting into deconstructors 2021-10-16 18:43:43 -04:00
Anuken
717a620ff4 Unpause game in logic variable dialog if necessary 2021-10-16 14:51:53 -04:00
Anuken
9dfd4d0049 Merge remote-tracking branch 'origin/master' 2021-10-16 13:01:07 -04:00
Anuken
290450de5b Fixed deconstructor not accepting direct unit payloads 2021-10-16 13:01:03 -04:00
Darkness#3729
d970eb45e3
Lol (#6171) 2021-10-16 12:45:16 -04:00
Anuken
b7f030eb13 Added logic variable display window 2021-10-16 12:30:00 -04:00
Anuken
f43e308dad Merge remote-tracking branch 'origin/master' 2021-10-16 10:22:24 -04:00
Anuken
bd329f57d6 Add sensing of reconstructor config 2021-10-16 10:22:20 -04:00
Sharlotte
06bf2711a4
Update [KO] bundles once again (#6147) 
* Why did you marge this

* Update bundle_ko.properties
 2021-10-16 09:49:58 -04:00
Matthew Peng
7ff9ad7351
Move payload blend check to BuildingComp (#6152) 2021-10-16 09:49:52 -04:00
Yuri Polyakov
91acda56c1
[RU] New blocks translated (#6159) 
* [RU] New blocks translated

ь

* Поправил 2 строчки

* а

* Еще перевел пару строк

* Поправил строчку

Как же плохо без очков
 2021-10-16 09:49:37 -04:00
JrTRinny
0f29a01292
Update bundle_th.properties (#6162) 2021-10-16 09:46:27 -04:00
Anuken
902f3695ee amend 2021-10-16 09:03:21 -04:00
Anuken
d5e239c610 Fixed #6168 2021-10-16 09:02:40 -04:00
Anuken
36064c63e3 Fixed #6166 2021-10-15 22:26:52 -04:00
Anuken
01a8a8bb4d Merge remote-tracking branch 'origin/master' 2021-10-15 21:40:13 -04:00
Anuken
4a979058c2 Crawler shootOnDeath 2021-10-15 21:40:09 -04:00
Fernando
e06640935d
Update servers_v6.json (#6165) 
Add new server
 2021-10-15 20:23:52 -04:00
Anuken
956cbe792b Fixed #6164 2021-10-15 18:48:59 -04:00
Anuken
e9e5fea306 Merge remote-tracking branch 'origin/master' 2021-10-15 17:04:39 -04:00
Anuken
f683496440 cleanup 2021-10-15 17:04:34 -04:00
buthed010203
b66eb173d8
Consistency (#6163) 
* Consistency

Why is this inconsistent with the portion just above it?

* C o n s i s t e n t
 2021-10-15 16:07:15 -04:00
Anuken
816ab161df Make Unit type default to Alpha 2021-10-15 12:07:07 -04:00
Anuken
bccdd86f30 Merge remote-tracking branch 'origin/master' 2021-10-15 11:41:00 -04:00
Anuken
9a5ac14bc3 Fixed #6158 2021-10-15 11:40:55 -04:00
router
dc14f42593
.pl hosting moment (#6156) 
* .pl hosting moment

* Update servers_be.json
 2021-10-15 09:33:26 -04:00
Anuken
18c5f508b1
Update README.md 2021-10-14 22:41:33 -04:00
Anuken
d8cf65e24c More permissive json type re-declarations 2021-10-14 21:59:02 -04:00
Anuken
3de9cfa1d7 Don't crash on invalid research 2021-10-14 21:26:34 -04:00
Anuken
df156444e7 Prioritize mod content in parser 2021-10-14 21:24:19 -04:00
Anuken
8a3dd53aa2 ClassMap regen 2021-10-14 21:01:20 -04:00
Anuken
b855849e4a Merge remote-tracking branch 'origin/master' 2021-10-14 20:58:13 -04:00
Anuken
6b59c1cd83 More branch merging 2021-10-14 20:58:03 -04:00
Anuken
ad1c75d050 WIP branch merging 2021-10-14 19:15:03 -04:00
Zelaux
dcb84f9faf
Made the Menus API less conflicting (#6154) 
* Made the Menus API less conflicting

* Fixed ignoring zero menuId in Menus
 2021-10-14 14:23:12 -04:00
itsragedev
d5babe88e3
Update bundle_de.properties (#6150) 
Changing some strings to match the original a little more.
 2021-10-14 11:38:25 -04:00
Anuken
b30eb26eb7 Merge remote-tracking branch 'origin/master' 2021-10-14 11:16:57 -04:00
Anuken
b5f639f518 AGP 7.0.3 2021-10-14 11:16:53 -04:00
Sunny Kim
ec1124499f
Disable sector info for specific sectors (#6151) 
* showSectorLandInfo

* showSectorLandInfo type
 2021-10-14 11:16:36 -04:00
Ilya246
095cc27ea6
Add shootOnDeath to weapons (#6149) 
* Update Weapon.java

* Add files via upload
 2021-10-14 09:50:57 -04:00
Anuken
a2f40a5565 Fixed #6148 2021-10-13 19:35:04 -04:00
Anuken
1f1a5bde3e Removed unused PayloadLaunchPad class 2021-10-13 14:00:31 -04:00