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

10102 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken
af122a76a4 Merge remote-tracking branch 'origin/master' 2020-11-30 12:52:15 -05:00
Anuken
5c89fa2d2b Achievement cleanup 2020-11-30 12:52:10 -05:00
Anuken
e76dee8cbe
Merge pull request #3665 from Quezler/patch-72 
Fix configuring buildings with blocks
 2020-11-30 12:32:46 -05:00
Anuken
639702ae1a Fixed unit tests 2020-11-30 11:12:09 -05:00
Patrick 'Quezler' Mounier
9df4eac2f8
Update BuildingComp.java 2020-11-30 16:36:10 +01:00
Anuken
18b0cd4e99 Merge remote-tracking branch 'origin/master' 2020-11-30 10:15:58 -05:00
Anuken
371a14af87 Inlined Time.time 2020-11-30 10:15:22 -05:00
Anuken
fc85aae500
Merge pull request #3662 from Quezler/patch-71 
Fixes #3661
 2020-11-30 09:44:01 -05:00
Patrick 'Quezler' Mounier
5ba99ecb42
Fixed #3661 2020-11-30 14:21:18 +01:00
Anuken
c41dfa46aa Fixed #3657 2020-11-29 19:41:10 -05:00
Anuken
ba9bc472e8 Merge remote-tracking branch 'origin/master' 2020-11-29 16:34:35 -05:00
Anuken
a7c18fc598 Fixed #3656 2020-11-29 16:34:31 -05:00
Anuken
67169a2ffc
Merge pull request #3655 from Quezler/patch-70 
display the repair field healed effect at the healed unit(s)
 2020-11-29 13:59:57 -05:00
Anuken
2a9f362e15 Fixed #3654 2020-11-29 13:59:09 -05:00
Patrick 'Quezler' Mounier
80f027471c
Update RepairFieldAbility.java 2020-11-29 19:35:49 +01:00
Anuken
682c1692df Compilation fix 2020-11-29 12:15:22 -05:00
Anuken
979e39f588 Added unit to BlockBuildBeginEvent 2020-11-29 12:14:46 -05:00
Anuken
bc114dfefc Version is "release" for real now 2020-11-29 11:37:02 -05:00
Anuken
29be8176c1 Fixed some crashes 2020-11-29 11:08:12 -05:00
Anuken
67c6e0179f Merge remote-tracking branch 'origin/master' 2020-11-29 10:37:11 -05:00
Anuken
e3f2966db3 Nevermind, reverting to beta for last pre-release 2020-11-29 10:37:07 -05:00
Anuken
9e53b3b7e6
Update bug_report.md 2020-11-29 10:33:51 -05:00
Anuken
8f186a16b3 Build beginPlace+Break access tracking / Instant rotation 2020-11-29 10:12:24 -05:00
Anuken
9a3b21d77a Fixed #3650 2020-11-29 09:54:52 -05:00
Anuken
23fc86fac1 Updated wiki links 2020-11-28 23:59:56 -05:00
Anuken
3d6fd8a351 De-abstracted weather 2020-11-28 23:23:39 -05:00
Anuken
3c51d82a1a Fixed #3648 2020-11-28 22:45:36 -05:00
Anuken
b63501b1c7 Core overfill bugfix 2020-11-28 21:51:26 -05:00
Anuken
810238d0f9 Cleanup 2020-11-28 20:30:43 -05:00
Anuken
bb16d1c613 Removed Abstract block classes for better code inspection 2020-11-28 19:12:27 -05:00
Anuken
b8cb17c0c5 Campaign production fixes 2020-11-28 15:08:53 -05:00
Anuken
9ca3cd49b8 Merge remote-tracking branch 'origin/master' 2020-11-28 13:57:23 -05:00
Anuken
e6544b73db Switching modifier from beta to release 2020-11-28 13:57:19 -05:00
Anuken
2e30cd31c2
Merge pull request #3646 from Slava0135/unit-payload 
Unit Payload spawning units on block removing/destruction
 2020-11-28 13:56:45 -05:00
slava0135
e6078bd4f6 oopsie x4 2020-11-28 21:49:59 +03:00
slava0135
b0477394e6 oopsie x3 2020-11-28 21:45:42 +03:00
slava0135
699750762f removing unnecessary stuff 2020-11-28 21:38:50 +03:00
slava0135
ee3348d160 oopsie x2 2020-11-28 21:10:12 +03:00
slava0135
6dc2486ce0 oopsie 2020-11-28 21:06:20 +03:00
slava0135
724a0018b8 unit payload improvements 2020-11-28 20:39:09 +03:00
slava0135
3b20c68a6f Merge branch 'master' of https://github.com/Anuken/Mindustry 2020-11-28 19:53:04 +03:00
Anuken
98206446e6 Merge remote-tracking branch 'origin/master' 2020-11-28 11:31:14 -05:00
Anuken
6e62859d0e Fixed #3644 2020-11-28 11:31:07 -05:00
Anuken
1f1701f1d6
Update README.md 2020-11-28 10:44:14 -05:00
Anuken
e6c99e0c6d
Update README.md 2020-11-28 10:42:50 -05:00
Anuken
e6c15b526a
Merge pull request #3620 from AydenRennaker/patch-8 
Update servers_v6.json
 2020-11-28 09:50:22 -05:00
Anuken
4de516b527
Merge pull request #3639 from LeoSko/patch-2 
Update servers_v6.json
 2020-11-28 09:50:02 -05:00
slava0135
815a483d2c typo in Fires: 
/** Start a fire on the tile. If there already is a file there, refreshes its lifetime. */
 2020-11-28 17:49:39 +03:00
Anuken
2816aeb6e9
Merge pull request #3451 from Angel-24/patch-2 
[Bundle][ES] Translation update
 2020-11-28 09:46:30 -05:00
Anuken
f40e523764
Merge pull request #3567 from CPXMC/patch-6 
Update bundle_zh_CN.properties
 2020-11-28 09:46:23 -05:00