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

9095 Commits

Author SHA1 Message Date
Anuken
8afb6006ce
Merge pull request #3941 from DeltaNedas/public 
make some proc stuff public
 2020-12-12 13:27:22 -05:00
Anuken
d117eb249e Merge remote-tracking branch 'origin/master' 2020-12-12 13:26:34 -05:00
Anuken
768d14088a Fixed #3943 2020-12-12 13:26:30 -05:00
Anuken
86f16bfc94
Merge pull request #3934 from LottieVixen/fix-issue 
fixed an error in global.js
 2020-12-12 11:31:36 -05:00
Anuken
8fa6b76bf9 Fixed #3936 2020-12-12 11:14:17 -05:00
DeltaNedas
19af1a0cc8 make some proc stuff public 2020-12-12 15:57:43 +00:00
Charlotte Lily-Llaitchee Vixen
409d27e3df found more occurances of the error 2020-12-12 07:23:23 +00:00
Charlotte Lily-Llaitchee Vixen
d47abd4f83 fixed an error in global.js 2020-12-12 07:15:24 +00:00
Anuken
e6c4a6cf69 Fixed #3932 2020-12-11 23:52:43 -05:00
Anuken
7c80af85e3 Property cleanup 2020-12-11 19:28:03 -05:00
Anuken
6983f57459 circleTarget unit AI parameter 2020-12-11 18:54:03 -05:00
Anuken
adeeaa6e27 Merge remote-tracking branch 'origin/master' 2020-12-11 12:56:10 -05:00
Anuken
075e7cf5d8 Disabled poly spawns 2020-12-11 12:56:07 -05:00
Anuken
98c4ee6e74
Merge pull request #3855 from AFFalcons/patch-1 
[QOL] Ability to Disable Weather Effects
 2020-12-11 12:52:07 -05:00
Anuken
87f9a077ac Increase wave spacing by 10sec every sector defeat 2020-12-11 12:43:43 -05:00
Anuken
bc26d3ba7b Merge remote-tracking branch 'origin/master' 2020-12-11 11:48:27 -05:00
Anuken
daaea591e4 Implemented #3486 with some minor changes 2020-12-11 11:48:20 -05:00
Anuken
c444cbf623
Merge pull request #3908 from buthed010203/patch-2 
Delete old bleeding edge builds on update
 2020-12-11 10:52:19 -05:00
Anuken
c54f398063 Fixed Parallax not moving players serverside 2020-12-10 18:21:39 -05:00
Anuken
2d6db1583b Improved approach behavior in formations/logic 2020-12-10 12:51:07 -05:00
buthed010203
b3beb92557
fixed 2020-12-10 12:18:11 -05:00
buthed010203
0f8304674f
now 100% less readable 2020-12-10 11:54:47 -05:00
buthed010203
3b3daf0e25
Delete old bleeding edge builds on update 2020-12-10 11:41:50 -05:00
Anuken
28e18332a0 Decreased junction item capacity 2020-12-10 09:58:09 -05:00
Anuken
dcc4764914 Merge remote-tracking branch 'origin/master' 2020-12-10 09:50:12 -05:00
Anuken
ee4ace1146 Fixed #3902 2020-12-10 09:50:06 -05:00
Patrick 'Quezler' Mounier
2da7afc081
Update Accelerator.java 2020-12-10 12:15:29 +01:00
Patrick 'Quezler' Mounier
e5b341c63e
Prevent accelerator from blending with conveyors 2020-12-10 12:14:57 +01:00
Anuken
a544888f16 cleanup 2020-12-09 20:20:22 -05:00
Anuken
57ad1d5366 Fixed #3899 2020-12-09 20:19:54 -05:00
Anuken
42d66d1136 Sector item system cleanup 2020-12-09 16:26:50 -05:00
Anuken
999cc9c651 Fixed #3890 2020-12-09 14:02:38 -05:00
Anuken
9537051590
Merge pull request #3836 from Nikolass1000/patch-5 
Update polish bundle
 2020-12-09 11:10:02 -05:00
Anuken
827372633d
Merge pull request #3838 from YellOw139/patch-3 
[Bundle][RO][Ready-for-Stable] Translation Update
 2020-12-09 11:09:42 -05:00
Anuken
c93bc0e457 Fixed #3884 / Fixed #3881 / Fixed #3880 2020-12-09 10:49:26 -05:00
Anuken
1460a15942 Fixed #3874 2020-12-08 21:36:20 -05:00
Anuken
15a07a4a18 Merge remote-tracking branch 'origin/master' 2020-12-08 16:43:27 -05:00
Anuken
e07a203d56 Don't use mods for floor decoration 2020-12-08 16:43:23 -05:00
Anuken
cead92b2c7
Merge pull request #3865 from Ordoviz/master 
Improve German translation
 2020-12-08 14:31:26 -05:00
Anuken
8d4ab2d7fb Cleanup 2020-12-08 14:23:13 -05:00
Lennard Hofmann
5ec5f1aa93 Improve German translation 2020-12-08 17:09:37 +01:00
Anuken
5e10c9d416 Decreased slag viscosity 2020-12-08 10:13:08 -05:00
Matthew
881491d151 Requested Changes 2020-12-08 09:10:30 -06:00
Matthew
863159a5fe Init 2020-12-07 18:14:58 -06:00
Anuken
849943a0de Increased surge smelter item capacity 2020-12-07 18:57:59 -05:00
Anuken
b5abc23c9d Minor Fungal Pass tweaks 2020-12-07 16:27:25 -05:00
Anuken
c2b03a3fdc Merge remote-tracking branch 'origin/master' 2020-12-07 15:52:53 -05:00
Anuken
4e1d999838 Rounded up lancer requirements 2020-12-07 15:52:50 -05:00
Anuken
4af971776f Rounded up lancer requirements 2020-12-07 15:48:07 -05:00
Anuken
86d2788232
Merge pull request #3735 from Nikolass1000/patch-4 
Fix for missing foreshadow description [PL]
 2020-12-07 15:18:13 -05:00
Anuken
5654e3120d Logic constant optimizations / Display admins on top 2020-12-07 12:51:31 -05:00
Anuken
25125f5a9b Removed Tile#bc(), use Tile.build instead 2020-12-07 11:44:57 -05:00
Anuken
5d4b8a43e3 Merge remote-tracking branch 'origin/master' 2020-12-07 11:10:23 -05:00
Anuken
557cb1c532 Fixed #3834 / Fixed #3835 / Fixed #3837 2020-12-07 11:10:19 -05:00
Patrick 'Quezler' Mounier
2a1ddf2573
Fixed #3839 2020-12-07 13:21:32 +01:00
YellOw139
fdb8da5767
[Bundle][RO][Ready-for-Stable] Translation Update 
This PR was tested in-game and is ready to merge at any time (unless marked as draft).
Its strings are ready and _**merging**_ is _**recommended**_ for **_the next stable release._**

Changelog:

- New strings/changes up to commit f9cfc8a2b8
- Typo fixes & various other improvements
 2020-12-07 13:50:55 +02:00
Nikolass1000
738aa26a20
Another completion 2020-12-07 10:41:16 +01:00
Anuken
e636ceb317
Merge pull request #3791 from joshuaptfan/master 
Enable double-click to play sector
 2020-12-06 11:47:54 -05:00
Joshua Fan
70cc6d07b0 Detect double-tap using count 2020-12-06 07:52:50 -08:00
Anuken
4d5c2c83fd Removed spawn shockwave delay 2020-12-06 10:50:13 -05:00
Anuken
cf91bcbd49 Run damage before spawn points activate 2020-12-06 10:23:24 -05:00
Anuken
18b19e964a
Merge pull request #3773 from Diegator04/patch-2 
Complete bundle_it
 2020-12-06 09:32:24 -05:00
Anuken
bf1ace4791
Merge pull request #3747 from VitLogArx/patch-1 
Update bundle_be.properties
 2020-12-06 09:31:52 -05:00
Anuken
dcd56a2d87
Merge pull request #3751 from Angel-24/patch-3 
Update bundle_es.properties
 2020-12-06 09:31:41 -05:00
Anuken
67c1db0fcc
Merge pull request #3765 from YellOw139/patch-2 
[Bundle][RO][Ready-for-Stable] Translation Update
 2020-12-06 09:31:24 -05:00
Anuken
6027fff543
Merge pull request #3811 from Prosta4okua/patch-2 
[Bundle][Uk_ua]Update translation
 2020-12-06 09:31:04 -05:00
Anuken
0c3c9fce2a
Merge pull request #3815 from sharlotte-mobile/patch-2 
Update bundle_ko.properties
 2020-12-06 09:30:50 -05:00
Quick-Korc
2d3b33bd9c
more id translate 2020-12-06 14:33:57 +07:00
Joshua Fan
dd6ae80817 Merge remote-tracking branch 'origin/master' 2020-12-05 22:56:34 -08:00
Sharlotte
304bfb5a40
Update bundle_ko.properties 
translated new hint value.
removed over-translated value.
checked some values and fix.
and do unification of some terms, reinforce poor translation etc
 2020-12-06 15:18:57 +09:00
Joshua Fan
58c1718d01 Detect double-tap 2020-12-05 22:07:09 -08:00
Anuken
29fe5dab06 Allow client research 2020-12-05 21:24:27 -05:00
Anuken
f9024e5500 Consider sectors with bases unlocked 2020-12-05 21:14:10 -05:00
Anuken
f9cfc8a2b8 Fixed #3812 / Fixed #3813 2020-12-05 20:48:56 -05:00
Anuken
d61bb66418 Fixed capture wave being set to 0 in some situations 2020-12-05 18:03:21 -05:00
Anuken
b0f62f25e6 No suggested mods 2020-12-05 17:53:49 -05:00
Anuken
bdbc9b865b Fixed distort artifacts 2020-12-05 17:50:29 -05:00
Prosta4okua
21c97571e0
Update bundle_uk_UA.properties 2020-12-06 00:45:30 +02:00
Prosta4okua
8e92be9037
Update bundle_uk_UA.properties 2020-12-06 00:42:18 +02:00
Anuken
f6428b8857 Fixed #3808 2020-12-05 16:40:54 -05:00
Anuken
cb3b43cc48 Disabled cursor scaling 2020-12-05 14:23:29 -05:00
Anuken
587c63fc92 Merge remote-tracking branch 'origin/master' 2020-12-05 14:16:06 -05:00
Anuken
97fa8057ba Fixed #3805 2020-12-05 14:16:02 -05:00
Anuken
6a2bb7b01f
Merge pull request #3794 from sharlotte-mobile/patch-1 
ko hotfix
 2020-12-05 11:05:55 -05:00
Anuken
edbced6642 Fixed #3798 2020-12-05 10:58:30 -05:00
Anuken
8c0477f6bd Fixed #3795 2020-12-05 10:30:46 -05:00
Angel_24
4e00c4b015
Update bundle_es.properties 2020-12-05 14:06:20 +01:00
Sharlotte
42f0364319
ko hotfix 
translate all missing values
removed over-translated values
and do Uniform some terms, correction of typos.
 2020-12-05 20:10:03 +09:00
Joshua Fan
6ececea004 Enable double-click to play sector 2020-12-05 00:58:56 -08:00
Anuken
6570d23512 Fixed #3786 2020-12-04 19:24:09 -05:00
Anuken
7ec3ab5a17 Fixed #3784 2020-12-04 18:55:37 -05:00
Anuken
bac4bb8c8f Heighten export cap when production is negative 2020-12-04 15:20:15 -05:00
YellOw139
5ac1c32652
coreIncinerate 2020-12-04 22:19:56 +02:00
Anuken
dec5a2aaaf Minor campaign tweaks 2020-12-04 15:07:35 -05:00
Anuken
5c3ae425ae Display locked sectors / Core incinerate hint 2020-12-04 11:31:27 -05:00
Anuken
744b1b2037 Looking into test failure 2020-12-04 10:56:47 -05:00
Anuken
a313ca8a26 Checking if tests fail 2020-12-04 10:44:39 -05:00
Anuken
bc70c08820 Fixed #3756 2020-12-04 10:25:41 -05:00
Diegator04
70c6cd2e87
Complete bundle_it 
I compared the **@GioIacca9's bundle** with mine so I was able to notice **mistakes** and **missing translations** which I corrected. We worked together and we discussed about a suitable words and phrases in italian. Furthermore I added the **first version** of _unit's names_, we'll improve them in the future.
 2020-12-04 13:55:22 +01:00
Angel_24
a8a629c5ef
Update bundle_es.properties 2020-12-04 11:24:25 +01:00
Angel_24
8e6dd98a5a
Update bundle_es.properties 2020-12-04 10:44:15 +01:00
YellOw139
39b8627a60
[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 48c8357ff7
- Abilities should now be clear enough. Less of a mess.
- Typo fixes & various other improvements
 2020-12-04 09:32:35 +02:00
Anuken
a451ad895c Slight sei buff 2020-12-03 20:29:58 -05:00
Anuken
d13b69c36f Sort community servers by ping 2020-12-03 16:49:30 -05:00
Angel_24
2af988d71f
Update bundle_es.properties 
Just one more little tweak
 2020-12-03 19:51:51 +01:00
Angel_24
63318f9b67
Update bundle_es.properties 
Minnor changes
 2020-12-03 19:47:00 +01:00
Angel_24
7f032edd6f
Update bundle_es.properties 
added servers disclaimer
 2020-12-03 19:37:12 +01:00
Angel_24
aff5b8bed6
Update bundle_es.properties 
New hints translated
 2020-12-03 19:28:01 +01:00
VitLogArx
22a50eec60
Update bundle_be.properties 
Partially updated belarusian translation. Fixed some mistakes.
 2020-12-03 21:00:41 +03:00
Anuken
51b4078288 Clean tests before running 2020-12-03 11:05:02 -05:00
Anuken
9fa2691b02 Fixed campaign idle boss spoofing 2020-12-03 10:05:52 -05:00
Nikolass1000
df418c5a7d
Small fix 2020-12-03 10:49:58 +01:00
Anuken
78c8c57649 Made water unlocked again 2020-12-02 18:01:46 -05:00
Anuken
e19c857d74 Possible crash fix 2020-12-02 16:08:53 -05:00
Anuken
b18f418c61 Reduced easy sector difficulty 2020-12-02 14:48:42 -05:00
Anuken
12ee38476c Minor build fix 2020-12-02 14:35:03 -05:00
Anuken
48c8357ff7 Added community server disclaimer 2020-12-02 14:32:51 -05:00
Anuken
a0702559f3 Fixed #3725 2020-12-02 14:14:42 -05:00
Anuken
a333fa3722 Added more hints 2020-12-02 13:40:49 -05:00
Anuken
5284750c6a Merge remote-tracking branch 'origin/master' 2020-12-02 13:02:35 -05:00
Anuken
9c616fd03b Possible fix for notched insets 2020-12-02 13:02:27 -05:00
Patrick 'Quezler' Mounier
2e586c4403
Update ConstructBlock.java 2020-12-02 18:54:46 +01:00
Patrick 'Quezler' Mounier
129f21e3a9
Update Boulder.java 2020-12-02 18:01:40 +01:00
Patrick 'Quezler' Mounier
435f15a450
Update ConstructBlock.java 2020-12-02 18:00:50 +01:00
Patrick 'Quezler' Mounier
3eac8cb6ad
Update Boulder.java 2020-12-02 17:59:20 +01:00
Patrick 'Quezler' Mounier
ea96bf2675
Update Block.java 2020-12-02 17:58:58 +01:00
Patrick 'Quezler' Mounier
e4c3664cc6
Update ConstructBlock.java 2020-12-02 16:36:07 +01:00
Patrick 'Quezler' Mounier
664cd6a3a0
Update ConstructBlock.java 2020-12-02 16:26:22 +01:00
Anuken
c26a9bd123
Merge pull request #3715 from Quezler/patch-75 
Keep items inside reconstructor when construction booped
 2020-12-02 10:05:51 -05:00
Anuken
395f7193ea Merge remote-tracking branch 'origin/master' 2020-12-02 09:56:06 -05:00
Anuken
775e17a726 Fixed #3709 2020-12-02 09:56:02 -05:00
Anuken
900ec8db6a
Merge pull request #3717 from Quezler/patch-76 
Fixes massdriver typo
 2020-12-02 09:54:37 -05:00
Anuken
e23a7c213c
Merge pull request #3710 from joshuaptfan/master 
Spellcheck English Steam achievements
 2020-12-02 09:53:46 -05:00
Patrick 'Quezler' Mounier
b64df565a4
Update MassDriver.java 2020-12-02 14:09:19 +01:00
Patrick 'Quezler' Mounier
382e27e1e4
Populate prevBuild when deconstructting 2020-12-02 12:02:49 +01:00
Patrick 'Quezler' Mounier
0dd95e736d
Add items back to reconstructor if it overwrote itself 2020-12-02 12:01:21 +01:00
MEEP of Faith
380c9ab113
Why is this protected in the first place? 2020-12-01 22:17:32 -08:00
joshuaptfan
1028ade80d Fix Poly unit description 2020-12-01 21:07:44 -08:00
Anuken
430538ea7e Possible fix for "unsupported combination of formats" error 2020-12-01 18:17:57 -05:00
Anuken
ee966d1198 Removed requirements for optional inputs of blocks 2020-12-01 18:02:20 -05:00
Anuken
076363ac87
Merge pull request #3651 from Prosta4okua/patch-1 
[Bundle][uk_UA]Update translation
 2020-12-01 16:53:47 -05:00
Anuken
327442f6fe
Merge pull request #3676 from Quezler/patch-74 
Fix BlockForge progress bar & recenter payload
 2020-12-01 16:53:13 -05:00
Anuken
c03400ccbc
Merge pull request #3622 from genNAowl/distributors-come-on 
Allow Distributors to Replace Conveyors
 2020-12-01 16:46:09 -05:00
Anuken
a5ad45ff30 Fixed #3706 2020-12-01 15:57:20 -05:00
Anuken
f8a859620d
Merge pull request #3669 from Quezler/patch-73 
per anuke's request
 2020-12-01 14:02:03 -05:00
Anuken
30107db81e Fixed #3702 2020-12-01 13:01:38 -05:00
Anuken
305e2642ba Minor bugfixes 2020-12-01 12:48:26 -05:00
Anuken
448fef980b Community server fetch logging 2020-12-01 09:39:30 -05:00
Anuken
11168efffa
Merge pull request #3524 from NgLamVN/master 
Vietnamese translations
 2020-12-01 09:24:22 -05:00
EzLam
daed19e79b . 2020-12-01 21:12:35 +07:00
EzLam
0e565f00ff Merge branch 'master' of https://github.com/NgLamVN/Mindustry 2020-12-01 21:12:16 +07:00
EzLam
d4ab674b1c Whyy ?? 2020-12-01 21:11:19 +07:00
Ngọc Lam
884abb54e6
Nooooooo 
NOOOOOOOOOOO
 2020-12-01 20:57:59 +07:00
EzLam
026d3ef9ab Fix some typos 2020-12-01 20:53:25 +07:00
EzLam
0abf333168 Done. 2020-12-01 20:50:29 +07:00
EzLam
a124c2a2b4 rEaLdY fOr rEvIeW... 2020-12-01 20:46:54 +07:00
AmateurPotion
a43957a1fa
Update bundle_ko.properties 
Sorry. I think my mind ran away from home.
 2020-12-01 22:44:03 +09:00
AmateurPotion
d0f3e413c6
Update bundle_ko.properties 2020-12-01 22:42:07 +09:00
AmateurPotion
469d5945b2
Typo 2020-12-01 22:40:41 +09:00
Anuken
c00228f960 Merge remote-tracking branch 'origin/master' 2020-12-01 08:39:21 -05:00
Anuken
ee28f4564b Final bugfixes 2020-12-01 08:39:16 -05:00
EzLam
5a8d0071df Yep. 2020-12-01 20:19:35 +07:00
Anuken
4c7b86196c
Merge pull request #3681 from PetrGasparik/v118 
[Bundle][cs] Czech translation - finishing touches for v6
 2020-12-01 08:10:06 -05:00
EzLam
6f139641da 85% complete. 2020-12-01 17:12:58 +07:00
Ngọc Lam
19a804db91
Update bundle_vi.properties 2020-12-01 17:01:24 +07:00
JINODK
f6d35822fb
Update from lines 1286 to 1490 
"How to break your hand in 3 hours" in a nutshell 🥴
 2020-12-01 16:56:29 +07:00
EzLam
8f1f015f3d Update contributors 2020-12-01 16:43:39 +07:00
EzLam
ed1b3ba608 Block.name.lol 2020-12-01 16:40:35 +07:00
Patrick 'Quezler' Mounier
1ed2b2eb2e
Update core/src/mindustry/world/blocks/experimental/BlockForge.java 2020-12-01 09:28:22 +01:00
GioIacca9
039f5ef8db
fixes 2020-12-01 08:27:39 +01:00
EzLam
be6b294087 Bruh. 2020-12-01 14:02:31 +07:00
Petr Gašparík
0ab593b7a5 Czech translation - finishing touches for v6 2020-12-01 08:00:26 +01:00
EzLam
67c35e12ae We dont need to translate this. 2020-12-01 13:36:18 +07:00
Ngọc Lam
7acc5e0858
72% complete 2020-12-01 13:16:45 +07:00
Prosta4okua
0553cafbe9
Update bundle_uk_UA.properties 2020-12-01 03:04:30 +02:00
Prosta4okua
9d78459d7d
Підготовка до виходу 6.0 ч.1 2020-12-01 02:31:46 +02:00
Anuken
c0c5257ed8 пропустит 
ь
 2020-11-30 19:14:03 -05:00
Anuken
fe4497a4da
Merge pull request #3541 from Prosta4okua/master 
[Bundle][RU] actual L10n
 2020-11-30 18:50:03 -05:00
Felix Corvus
8843e49ac8
6 changed lines (@Prosta4okua) 
- hint.desktopMove
- hint.respawn.mobile
- hint.placeDrill
- hint.placeDrill.mobile
- hint.placeConveyor
- hint.placeTurret
 2020-12-01 02:34:27 +03:00
Anuken
a232839cfd
Merge pull request #3616 from AmateurPotion/patch-12 
Korean translation bundle
 2020-11-30 18:30:56 -05:00
Anuken
26e90c99d3
Merge branch 'master' into patch-13 2020-11-30 18:14:51 -05:00
Anuken
fe59031fce
Merge pull request #3674 from GioIacca9/patch-12 
v6 Italian bundle
 2020-11-30 18:13:16 -05:00
Anuken
56e326ab1b
Merge pull request #3671 from Nikolass1000/patch-2 
Polish complete translation.
 2020-11-30 18:12:44 -05:00
Anuken
1a3af01b24
Merge pull request #3642 from laohuaji233/patch-42 
Update bundle_zh_CN.properties[Unfinished]
 2020-11-30 18:11:50 -05:00
Anuken
7a0bac95a5
Merge pull request #3615 from Catchears/german-v6 
Final v6 german translation
 2020-11-30 18:11:24 -05:00
Anuken
625486ade9
Merge pull request #3584 from Lapis256/master 
update bundle_ja.properties
 2020-11-30 18:11:06 -05:00
Anuken
38f722e0b6
Merge branch 'master' into patch-3 2020-11-30 18:10:28 -05:00
Anuken
9c773f48ee
Merge pull request #3548 from simba-fs/master 
modify zh-TW translation
 2020-11-30 18:10:07 -05:00
Anuken
d142777fca
Merge pull request #3547 from PetrGasparik/v117 
[Bundle][cs] Czech translation ready for 6.0
 2020-11-30 18:09:57 -05:00
Anuken
2332595f2d
Merge pull request #3545 from YellOw139/patch-1 
[Bundle][RO] Translation Update
 2020-11-30 18:09:36 -05:00
Anuken
cdb1003133
Merge pull request #3443 from DaGamerFiles/patch-4 
[Bundle][ID] Updated translation
 2020-11-30 18:09:14 -05:00
Vanguard
ca2dabe769
КОММИТ МНЕ В РОУТЕР 2020-12-01 02:07:36 +03:00
Felix Corvus
0c1817eb12 2 changed lines; 9 translated lines 
Changed:

- hint.placeTurret
- hint.breaking.mobile

Translated:

- hint.research
- hint.research.mobile
- hint.unitControl
- hint.unitControl.mobile
- hint.launch
- hint.launch.mobile
- hint.schematicSelect
- hint.conveyorPathfind
- hint.conveyorPathfind.mobile
 2020-12-01 01:50:10 +03:00
Anuken
c0c8235e3d Merge remote-tracking branch 'origin/master' 2020-11-30 17:49:24 -05:00
Anuken
d868ff81bf Dependency resolution fix 2020-11-30 17:49:20 -05:00
Anuken
16f64a90a8
Merge pull request #3675 from Remint32/patch-4 
typo
 2020-11-30 17:32:08 -05:00
Felix Corvus
8dae9babab
not typo 2020-12-01 01:27:34 +03:00
Anuken
d33cea6003 Merge remote-tracking branch 'origin/master' 2020-11-30 17:12:33 -05:00
Anuken
9870098457 Updated Steam meta / Fixed #3673 2020-11-30 17:12:29 -05:00
Patrick 'Quezler' Mounier
4102c380d2
Update BlockForge.java 2020-11-30 22:47:26 +01:00