mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-03-05 07:00:49 +07:00
Code Issues Packages Projects Releases Wiki Activity
14,505 Commits 4 Branches 160 Tags 2.3 GiB
7b1d36a40a
Commit Graph

12241 Commits

Author SHA1 Message Date
Anuken
9b33ab3c0a Fixed 2022-05-11 00:44:15 -04:00
Anuken
24a6ef2bc3 Correct team usage 2022-05-10 23:13:59 -04:00
Anuken
afe02bf3a0 Misc fixes 2022-05-10 22:55:28 -04:00
Anuken
aa3bf50731 Merge remote-tracking branch 'origin/master' 2022-05-10 21:56:41 -04:00
Anuken
8c98f8f9bf Mass driver reloadTime -> reload 2022-05-10 21:56:34 -04:00
Somka000
64e5561b5a
Translate things from Erekir and some other () 2022-05-10 21:16:32 -04:00
Anuken
2e4037451f Merge branch 'erekir' of https://github.com/Anuken/Mindustry 2022-05-10 21:07:48 -04:00
Yuri Polyakov
99f98cc761
Update bundle_ru.properties () 
* Update bundle_ru.properties

* Update bundle_ru.properties

упс

Co-authored-by: Anuken <arnukren@gmail.com>
 2022-05-10 21:07:33 -04:00
Yuri Polyakov
05cbc8a477
Update bundle_ru.properties () 
* Update bundle_ru.properties

* Update bundle_ru.properties
 2022-05-10 21:07:13 -04:00
Anuken
e15ed4403c Unignore icons.properties 2022-05-10 20:38:05 -04:00
Anuken
60d3a51ebc What a horrible waste of time 2022-05-10 20:08:48 -04:00
Anuken
8f31faa98e Merge remote-tracking branch 'origin/master' 2022-05-10 19:19:38 -04:00
Anuken
6a129371d2 Fixed 2022-05-10 19:19:21 -04:00
Github Actions
05578fe8b7 Automatic bundle update 2022-05-10 23:02:41 +00:00
Anuken
6bda5546a6 Merge branch 'erekir' of https://github.com/Anuken/Mindustry 2022-05-10 19:01:40 -04:00
Anuken
0c6c9620a7 lang 2022-05-10 19:01:33 -04:00
end-me-please
9b8a09892a
Update bundle_de.properties () 
aHR0cHM6Ly9pLmltZ3VyLmNvbS9NSG1kV0plLnBuZw==
 2022-05-10 18:58:36 -04:00
Github Actions
fbf70224e4 Automatic bundle update 2022-05-10 22:58:02 +00:00
Nunting
3db6637e9f
Update bundle_ko.properties () 
* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties

Co-authored-by: Anuken <arnukren@gmail.com>
 2022-05-10 18:56:56 -04:00
Anuken
a089afc626 Merge branch 'master' of https://github.com/Anuken/Mindustry into erekir 
 Conflicts:
	core/assets/bundles/bundle_zh_TW.properties
 2022-05-10 18:15:43 -04:00
Epowerj
6c39249899 Fixed waves on level three not working right with new map changes 2022-05-10 18:14:56 -04:00
Epowerj
b7eeec243e Merge remote-tracking branch 'origin/erekir' into erekir 2022-05-10 17:37:25 -04:00
Epowerj
15fa120eeb Fixed an issue with three 2022-05-10 17:37:19 -04:00
Anuken
01ba06ddef Faster erekir mining speed 2022-05-10 17:35:43 -04:00
Epowerj
1eba814e68 adjusted levels three and four for new tech changes 2022-05-10 16:44:19 -04:00
Anuken
eb8395fa19 Requirement swapbac 2022-05-10 16:25:06 -04:00
Anuken
4ddcd57191 Merge branch 'erekir' of https://github.com/Anuken/Mindustry into erekir 2022-05-10 16:21:24 -04:00
Anuken
cffba7b685 Made useless items/liquids/blocks hidden 2022-05-10 16:21:22 -04:00
dead inside
7683214eff
BuildTurret infinite resources fix () 
* BuildTurret infinite resources fix

* I'm not a good script kiddie

Too much Testing Utilities has plagued me

* Team infinite resources as well
 2022-05-10 16:04:30 -04:00
Anuken
36513d6ed6 Tech tree restructuring 2022-05-10 16:01:49 -04:00
Anuken
3dd17474c5 Fixed OpenGL vertex arrays / Fixed bullet shrink crop 2022-05-10 13:12:12 -04:00
Anuken
9ac75df34e Merui swap / Bomber command support 2022-05-10 11:13:13 -04:00
Anuken
85d7f2cd62 Bugfixes 2022-05-10 10:17:43 -04:00
Anuken
ca67b0f43c launchCapacityMultiplier per-planet 2022-05-10 00:24:44 -04:00
Anuken
6efca04ea8 and gone 2022-05-09 23:50:01 -04:00
Anuken
95254eef44 Duct router distribution fixes 2022-05-09 23:11:52 -04:00
Anuken
051a41e86d String overload for mod options 2022-05-09 22:35:58 -04:00
Anuken
83d15ce65e Merge remote-tracking branch 'origin/erekir' into erekir 2022-05-09 20:51:31 -04:00
Anuken
2162770e57 Custom settings categories 2022-05-09 20:51:27 -04:00
xem8k5
db947d33ca
Update bundle_zh_CN.properties twice () 
* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties
 2022-05-09 20:06:23 -04:00
Anuken
aa1abeb4be Typo fixes 2022-05-09 19:55:51 -04:00
Anuken
2b46bbfd2c Merge remote-tracking branch 'origin/erekir' into erekir 2022-05-09 18:24:31 -04:00
Anuken
76f1cfbc07 Actually fixed Serpulo base gen 2022-05-09 18:24:27 -04:00
Github Actions
1a07b1514f Automatic bundle update 2022-05-09 21:42:41 +00:00
Anuken
31c5ef2dc5 Some world processor documentation 2022-05-09 17:41:42 -04:00
Anuken
cf1fb98d5c Misc bugfixes 2022-05-09 17:33:43 -04:00
dead inside
8269d79e56
Liquid Output Display () 
* Liquid Output Display

* hshfhqwehpvoipwjovpwiqffjvpwqenoij0n89f4v123f2v40q9j8hbnwqvceinopjj90cmqwvinv21904uinfhu0bnv9j90h84g bvb8024q3bh80b3498vcfj932ndjqdjponjewopnviqvnifjwp9ghpnewuubgqjiojpdfoekwdckmpqwpkmidpkewpjndqvjwnfnj8132nt345879ytgh342890yu4598yhubn4t9hrj[tevpkofkwemfvewrphojfekpcfoerkfwmvfh23bng0398g9834ifvrfnwurbgiwnwgherhnwenhgpvrnnivjpjnipfqwjniwqfejnipofvniwejpfqjwociomjefjjmvcmj21m4f98v00ngbhegwefgpjroiewjfqfwpiojnmem

* Pull to separate function

The javadoc description could be different

* In case mods have liquid icons larger than 32x32
 2022-05-09 17:06:55 -04:00
Anuken
94db45f148 Merge branch 'erekir' of https://github.com/Anuken/Mindustry into erekir 2022-05-09 16:55:10 -04:00
Anuken
6cc30e6ebd Fixed tank tread rects 2022-05-09 16:55:08 -04:00
dead inside
2e71c3cf8a
"speed" -> "alpha" () 2022-05-09 16:52:36 -04:00
Anuken
a82a6f4324 Manual trimming of sprites 2022-05-09 15:14:09 -04:00
Anuken
03a3e43b01 Merge remote-tracking branch 'origin/erekir' into erekir 2022-05-09 15:01:53 -04:00
Anuken
f9be361846 Cropped sprite packing 2022-05-09 15:01:49 -04:00
Epowerj
6e23fffe41 More level 2 tweaks to make it easier 2022-05-09 13:28:27 -04:00
Epowerj
5c6b8df764 Merge remote-tracking branch 'origin/erekir' into erekir 2022-05-09 12:54:28 -04:00
Anuken
0b141b6eb0 more misc bugfixes 2022-05-09 12:51:05 -04:00
Epowerj
1668035759 Tweaked clipping issues in onset 2022-05-09 12:45:48 -04:00
Anuken
4635aad335 Merge branch 'erekir' of https://github.com/Anuken/Mindustry into erekir 2022-05-09 12:21:23 -04:00
Anuken
41413d65b7 Do not allow cross-planet launch pads 2022-05-09 12:21:21 -04:00
Epowerj
79240a45d0 More tweaks to level two - show players they can water cool breach turret 2022-05-09 11:46:11 -04:00
Anuken
f2e5efaea7 Merge remote-tracking branch 'origin/erekir' into erekir 2022-05-09 11:45:05 -04:00
Anuken
3bbb00db9a bugfixes 2022-05-09 11:45:01 -04:00
Epowerj
c5cafd5573 Adjustments to level two to make it easier 2022-05-09 11:39:16 -04:00
Anuken
900e3ec334 bugfixes 2022-05-09 09:49:15 -04:00
Anuken
a8a8cc950e ok ilya 2022-05-09 04:51:44 -04:00
Anuken
846aa3a5ab world processors accessible in playtest 2022-05-09 04:42:42 -04:00
Anuken
a1ac74950c notify spam fix 2022-05-09 04:33:13 -04:00
Anuken
eb52c6d61f Status apply instruction / Bugfixes 2022-05-09 04:10:18 -04:00
Anuken
aace191116 Crash fix 2022-05-09 03:06:25 -04:00
Anuken
d8ceb03b3c Fixed tests 2022-05-08 23:58:36 -04:00
Anuken
1728b58290 Merge branch 'erekir' of https://github.com/Anuken/Mindustry into erekir 2022-05-08 23:53:28 -04:00
Anuken
4333f12fd8 More turret consistency / Power curve for recoil 2022-05-08 23:53:25 -04:00
Goobrr
39941799d9
correct label position () 2022-05-08 23:50:14 -04:00
Anuken
9697036599 Merge branch 'erekir' of https://github.com/Anuken/Mindustry into erekir 2022-05-08 23:17:40 -04:00
Anuken
5a3c8573c3 WIP Turret field rename / More JSON consume support 2022-05-08 23:17:37 -04:00
xem8k5
f16119cd0f
Update bundle_zh_CN.properties () 
* Translation zh_cn partly

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

发觉强化不符合题意，普通容器血量220 容量300，“强化”容器血量480 容量250，反向强化是不是？故固化符合题意
 2022-05-08 21:28:20 -04:00
buthed010203
efee6b9713
Minor blockrenderer cleanup () 2022-05-08 20:18:02 -04:00
Anuken
668b09e955 Misc bugfixes 2022-05-08 17:07:06 -04:00
Anuken
a7ecdf8aab crash fix? 2022-05-08 13:57:52 -04:00
Anuken
78b74d01cb a 2022-05-08 13:54:48 -04:00
Anuken
1733381cf2 Bugfixes 2022-05-08 13:52:43 -04:00
Anuken
5492c52249 Crash fix 2022-05-08 13:20:52 -04:00
Anuken
12c33cc032 Merge branch 'erekir' of https://github.com/Anuken/Mindustry into erekir 2022-05-08 12:54:38 -04:00
Anuken
02bbc10f40 Bugfixes 2022-05-08 12:54:36 -04:00
Github Actions
e69aa6bf49 Automatic bundle update 2022-05-08 16:46:41 +00:00
Anuken
d28a839f55 RTS unit control improvements/fixes 2022-05-08 12:45:48 -04:00
Anuken
61b01892e7 Removed sector 5 2022-05-08 12:19:37 -04:00
Anuken
ace6e09979 Possible unit control fix 2022-05-08 12:09:06 -04:00
Anuken
33cfeeb500 JSON tank/hover support 2022-05-08 12:06:12 -04:00
Anuken
08ecb7f335 Merge branch 'erekir' of https://github.com/Anuken/Mindustry into erekir 2022-05-08 10:18:12 -04:00
Anuken
51a9876d95 WIP game-over core pan 2022-05-08 10:18:09 -04:00
Github Actions
f5ef01f01e Automatic bundle update 2022-05-08 13:30:05 +00:00
Anuken
396363c11d Replaced stats entries to assist translation changes 2022-05-08 09:29:10 -04:00
Goobrr
0f3780dbb2
GameOverDialog rework () 
* GameOverDialog rework

* cleanup
 2022-05-08 09:26:49 -04:00
Anuken
e94e31aedf Fixed / Fixed / Fixed 2022-05-08 09:23:43 -04:00
Anuken
aaccb36d93 BuildTurret fixes 2022-05-08 01:00:16 -04:00
Anuken
9da9fa82e5 Merge branch 'erekir' of https://github.com/Anuken/Mindustry into erekir 2022-05-08 00:43:40 -04:00
Anuken
a5b6c2a03a Fixed sector base shift + impossible requirements 2022-05-08 00:43:38 -04:00
buthed010203
09dc1fa92a
No. () 
This keeps driving me mad when merging
 2022-05-08 00:27:30 -04:00
Anuken
f055e35729 Crash fix 2022-05-08 00:03:06 -04:00
Anuken
c8f81bd9b0 shadowElevationScl 2022-05-07 22:57:12 -04:00
Anuken
7b47a5cc30 Fixed auto-unlock for campaign sectors 2022-05-07 22:08:49 -04:00
Anuken
a9d4e56e66 Crash fix 2022-05-07 21:20:12 -04:00
Anuken
471504090a Misc bugfixes 2022-05-07 20:44:28 -04:00
Anuken
b3d064b1f7 Merge branch 'erekir' of https://github.com/Anuken/Mindustry into erekir 2022-05-07 14:09:49 -04:00
Anuken
0d61d98c70 Bugfixes 2022-05-07 14:09:47 -04:00
Github Actions
a3ef2a6185 Automatic bundle update 2022-05-07 17:40:26 +00:00
RTOmega
86161ffa4c
TR Bundle Update (v7) () 
* until 574

* TR Bundle Update (v7)
 2022-05-07 13:39:42 -04:00
彭瑞暄
ed40127539
Updated bundle_zh_TW translations () 
* Update bundle_zh_TW.properties

Translation polish, changed unit from "千" to "K", updated naval support uints.

* Update bundle_zh_TW.properties

Another round of polishing.
 2022-05-07 13:21:03 -04:00
Anuken
dfac73d81c Do not make cores derelict 2022-05-07 11:56:42 -04:00
Anuken
5c9ad34322 Map AI rebalancing 2022-05-07 11:47:41 -04:00
Anuken
792a7b5755 Laser crash fix 2022-05-07 11:44:36 -04:00
Anuken
f99a523002 Fixed beam node replacement update 2022-05-07 11:21:35 -04:00
Anuken
7885a46cd5 Renamed TeamData blocks -> plans 2022-05-07 10:57:21 -04:00
Anuken
8f2e1163dd Fixed wave simulation estimation 2022-05-07 10:45:43 -04:00
Anuken
8fae99e780 Fixed JSON part support 2022-05-07 10:22:33 -04:00
Anuken
17d8d5875e Merge remote-tracking branch 'origin/erekir' into erekir 2022-05-07 10:09:05 -04:00
Anuken
7c8cbd41a4 Added DrawPart to ClassMap 2022-05-07 10:08:59 -04:00
Epowerj
d4acf3c9a5 Fixed level four requirements 2022-05-07 01:35:56 -04:00
Anuken
dfb01ebdf1 Fixed mod crash 2022-05-07 01:12:20 -04:00
Anuken
9c86433047 Unit command tweaks 2022-05-07 00:41:27 -04:00
Anuken
8b2d4d8f3e Merge remote-tracking branch 'origin/erekir' into erekir 2022-05-07 00:34:31 -04:00
Anuken
c9b9cf6cc4 Fixed potential divide-by-zero in bloom shader 2022-05-07 00:34:28 -04:00
Github Actions
043cd7f5be Automatic bundle update 2022-05-07 04:31:11 +00:00
Anuken
aa0e254f0e Mobile unit command support 2022-05-07 00:30:25 -04:00
Anuken
6740b60af2 Misc bugfixes, AI hit retaliation 2022-05-06 23:33:22 -04:00
Anuken
f6e68e91d0 Temporary sprite packing fix 2022-05-06 22:13:52 -04:00
Anuken
2c07b9cdb1 Removed unused class 2022-05-06 21:12:57 -04:00
Anuken
3367fa37be Merge remote-tracking branch 'origin/erekir' into erekir 2022-05-06 21:05:43 -04:00
Anuken
7fbd196919 Five is inaccessible 2022-05-06 21:05:38 -04:00
Github Actions
88821befe6 Automatic bundle update 2022-05-07 00:35:16 +00:00
Anuken
59674dfcf2 Maps updated, ready to go 2022-05-06 20:26:33 -04:00
Anuken
fb389c9984 Bugfixes 2022-05-06 20:20:09 -04:00
Anuken
62b632758b Merge branch '7.0-features' of https://github.com/Anuken/MindustryPrivate into 7.0-features 2022-05-06 20:07:44 -04:00
Anuken
9c0fd7c4c1 Bugfixes 2022-05-06 20:07:41 -04:00
Epowerj
768fac38c6 Update map three to now allow walkers to get through to the enemy base area from the north 2022-05-06 20:06:06 -04:00
Anuken
bb6b8b020d more 2022-05-06 19:13:39 -04:00
Anuken
688e02c04a Fixed reserach cost of certain units 2022-05-06 19:12:48 -04:00
Anuken
ed774a6aa2 actually 2022-05-06 18:46:00 -04:00
Anuken
a2af906f1a Fab cost fix 2022-05-06 18:43:59 -04:00
Anuken
46f43a3456 Bugfixes 2022-05-06 18:28:51 -04:00
Anuken
a86f62cbe8 Balancing 2022-05-06 16:00:47 -04:00
Anuken
f8789244d6 Balancing 2022-05-06 15:43:50 -04:00
Anuken
d4411fd234 Tech tree things 2022-05-06 14:53:44 -04:00
Epowerj
c73e364b55 Merge remote-tracking branch 'origin/7.0-features' into 7.0-features 2022-05-06 14:47:16 -04:00
Epowerj
63da9c40f7 Fixed issues with map four 2022-05-06 14:47:11 -04:00
Anuken
0c1926ade6 Block renaming done 2022-05-06 14:35:06 -04:00
Anuken
7540b1c10a Fixed load map limit 2022-05-06 14:14:10 -04:00
Anuken
5ef423c185 ClassMap updae 2022-05-06 14:03:30 -04:00
Anuken
55f729565b Modding API-related tweaks 2022-05-06 13:45:43 -04:00
Anuken
9da97c4d3c Better erekir wave map 2022-05-06 00:43:49 -04:00
Anuken
a7f84e8690 Better json mod warning logging 2022-05-05 22:31:27 -04:00
Anuken
f7175540f8 Disable world processor rule 2022-05-05 20:36:11 -04:00
Anuken
60fb2e537f Merge branch '7.0-features' of https://github.com/Anuken/MindustryPrivate into 7.0-features 2022-05-05 20:30:41 -04:00
Anuken
4d680ec91d Docs 2022-05-05 20:30:37 -04:00
Epowerj
efbc0c96be Updated a bunch of maps for correct names and changes to unit production 2022-05-05 19:58:08 -04:00
Anuken
429e07adec More units renamed 2022-05-05 13:39:14 -04:00
Anuken
7782331dbc Unit renamings 2022-05-05 12:26:23 -04:00
Anuken
05d5a160fe Block tweaks 2022-05-05 10:46:58 -04:00
Anuken
6a026f7286 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/assets/bundles/bundle_ko.properties
 2022-05-05 00:31:49 -04:00
Anuken
7508e1e0e3 Quell buff 2022-05-05 00:31:30 -04:00
Anuken
d8cf443cd9 Docs 2022-05-04 23:10:42 -04:00
Anuken
e81438a7a9 Styles documented 2022-05-04 22:31:53 -04:00
Anuken
93d299716c WIP style refactoring 2022-05-04 20:24:59 -04:00
Anuken
705b419799 Removed some unused content 2022-05-04 17:02:05 -04:00
Anuken
c28db45c4b Assembler module block stuff 2022-05-04 16:55:27 -04:00
Anuken
22905de094 Cleanup of some GL stuff 2022-05-04 15:25:39 -04:00
Anuken
771c2270df Phase tech tree fix 2022-05-04 00:57:00 -04:00
Anuken
7640fa0bf0 Misc cleanup & target/hit movements 2022-05-03 20:39:54 -04:00
Anuken
8b9eb0b466 Cleanup 2022-05-03 15:27:30 -04:00
Anuken
a784d184aa Merge branch '7.0-features' of https://github.com/Anuken/MindustryPrivate into 7.0-features 2022-05-03 14:42:15 -04:00
Anuken
210481703f Lots of balancing/tweaks 2022-05-03 14:42:11 -04:00
Epowerj
bc1de34296 Tweaked objectives for level 1 2022-05-03 14:41:49 -04:00
Anuken
459428ef25 Crash fix, begin rebalancing 2022-05-03 11:23:24 -04:00
Anuken
6c3eb3fe1e Delta fix 2022-05-02 22:41:37 -04:00
Anuken
4dcfdbe82f Merge branch '7.0-features' of https://github.com/Anuken/MindustryPrivate into 7.0-features 2022-05-02 22:24:48 -04:00
Anuken
78f3e23f0b WIP bullet shotgun for T4 tank 2022-05-02 22:24:45 -04:00
Epowerj
9f255f8178 Tweaked level three 2022-05-02 20:28:17 -04:00
Anuken
de9a41159f Discord link in desktop menu 2022-05-02 19:41:43 -04:00
Anuken
61d145e233 Advanced reconstructor in tech tree 2022-05-02 19:26:21 -04:00
Anuken
6553ff9e56 diffuse in tech tree 2022-05-02 18:54:39 -04:00
Anuken
02eec0e43c Merge branch '7.0-features' of https://github.com/Anuken/MindustryPrivate into 7.0-features 2022-05-02 18:53:15 -04:00
Anuken
98b01953a4 Diffuse turret 2022-05-02 18:53:12 -04:00
Epowerj
e0062edc42 Tweaked level three 2022-05-02 18:42:07 -04:00
Epowerj
be13df6bd8 Tweaked level three 2022-05-02 17:54:30 -04:00
Epowerj
fce48cd92e Changed reinforcedLiquidRouter requirements to use graphite instead of tungsten 2022-05-02 17:54:20 -04:00
Anuken
068c0dbe4d Walker in tech tree 2022-05-02 17:51:40 -04:00
Anuken
4d54b8251d Map rename 2022-05-02 16:33:41 -04:00
Epowerj
383beb3e8d Map 4 mostly done 2022-05-02 16:31:42 -04:00
Epowerj
85fb2bfa85 Merge remote-tracking branch 'origin/7.0-features' into 7.0-features 2022-05-02 15:47:36 -04:00
Epowerj
c259a36922 Map 4 mostly done 2022-05-02 15:47:31 -04:00
Anuken
3542bd9e90 T3 tank done 2022-05-02 15:37:43 -04:00
Anuken
5f0ef9b27e WIP T3 tank 2022-05-02 14:29:32 -04:00
Anuken
07c24d7164 Merge branch '7.0-features' of https://github.com/Anuken/MindustryPrivate into 7.0-features 2022-05-01 23:50:52 -04:00
Anuken
1d249f233f UnitType docs 2022-05-01 23:50:49 -04:00
Epowerj
0cb6f00ed2 Merge remote-tracking branch 'origin/7.0-features' into 7.0-features 2022-05-01 20:19:29 -04:00
Epowerj
b982f987c8 Map 4 tweaks 2022-05-01 20:19:25 -04:00
Anuken
5e7428f034 Merge remote-tracking branch 'private/7.0-features' into 7.0-features 2022-05-01 17:45:40 -04:00
Anuken
f85fba264a Fixed crawler targeting 2022-05-01 17:45:36 -04:00
Epowerj
51a6260798 Merge remote-tracking branch 'origin/7.0-features' into 7.0-features 2022-05-01 16:57:18 -04:00