1
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 11:45:51 +00:00
Commit Graph

3453 Commits

Author SHA1 Message Date
TheBusyBiscuit
ec95797cbf Fixes #2240 2020-08-22 02:38:17 +02:00
TheBusyBiscuit
b36e3e41a8 Reduced technical debt 2020-08-22 02:36:36 +02:00
TheBusyBiscuit
e839ece670 Reduced technical debt 2020-08-22 00:57:44 +02:00
100petr
d6e519c840 Translate messages_cs.yml via GitLocalize 2020-08-21 13:27:22 +00:00
TheBusyBiscuit
95655dc6fc A few fixes and performance improvements 2020-08-21 15:19:08 +02:00
TheBusyBiscuit
167326292d Maybe fixes #1951 (+ performance improvements) 2020-08-20 23:25:43 +02:00
TheBusyBiscuit
29092b87c9
Merge branch 'experimental' into IcePick 2020-08-20 22:56:09 +02:00
TheBusyBiscuit
d8d4811974 Merged Nitwit Rune and Shulker Shell PRs 2020-08-20 18:20:25 +02:00
TheBusyBiscuit
65021f7615
Merge branch 'rune' into ShulkerShell 2020-08-20 17:33:27 +02:00
TheBusyBiscuit
88be3e79ff
Merge branch 'master' into refactoring/block-energy 2020-08-20 16:55:35 +02:00
LinoxGH
73d623a0fd
Github Web and its indent issues. 2020-08-20 14:39:31 +03:00
LinoxGH
37bacaa8cb
Apparently SlimefunPlugin.instance is private now. 2020-08-20 14:30:21 +03:00
LinoxGH
bf3b04a4c5
Oops sorry for this silly mistake 2020-08-20 14:19:48 +03:00
LinoxGH
0946b88cd1
Fixed symbol name issues in ClimbingPick.java 2020-08-20 14:11:46 +03:00
LinoxGH
a54e8623d3
Merge branch 'master' into ShulkerShell 2020-08-20 12:21:50 +03:00
LinoxGH
5f78e7a854
Merge branch 'master' into IcePick 2020-08-20 11:43:14 +03:00
Vravinite
310622c3ac Translate messages_es.yml via GitLocalize 2020-08-19 23:50:04 +00:00
LinoxGH
5f0df75b81 Translate messages_tr.yml via GitLocalize 2020-08-19 12:42:33 +00:00
TheBusyBiscuit
4f3854877b
[CI skip] Merge pull request #2230 from TheBusyBiscuit/gitlocalize-12659
Updated Russian localizations
2020-08-19 14:37:35 +02:00
TheBusyBiscuit
15487fb333 Translate messages_de.yml via GitLocalize 2020-08-19 12:33:36 +00:00
TheBusyBiscuit
9787cf734b Renamed to Nitwit Rune 2020-08-19 14:31:07 +02:00
SoSeDiK
273e459e26 Translate recipes_ru.yml via GitLocalize 2020-08-19 12:20:10 +00:00
SoSeDiK
dbd5cc1641 Translate messages_ru.yml via GitLocalize 2020-08-19 12:20:08 +00:00
TheBusyBiscuit
b1abf7bb99 Fixed categories 2020-08-19 14:12:51 +02:00
TheBusyBiscuit
8c5d15e311 Increased Bartering chance 2020-08-19 14:11:33 +02:00
TheBusyBiscuit
66fa277014 A few additional changes 2020-08-19 14:07:42 +02:00
TheBusyBiscuit
57b3f06aa6
Merge pull request #2220 from dniym/NitwitRune
Added Rune of Unemployment
2020-08-19 13:58:16 +02:00
TheBusyBiscuit
aa22e7c9b2 [CI skip] A bit of refactoring and documentation 2020-08-19 13:54:46 +02:00
dniym
e13e7e1400
Update RuneOfUnemployment.java
made requested changes
2020-08-18 15:30:12 -04:00
TheBusyBiscuit
9d4d2060ba [CI skip] Added a few more strings to translation files 2020-08-18 14:45:51 +02:00
TheBusyBiscuit
6be0709aea Fixes #2138 2020-08-18 14:18:44 +02:00
TheBusyBiscuit
85b0c80e3f Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-08-17 17:31:39 +02:00
TheBusyBiscuit
8e8a87fce6 Fixed ChestTerminal timings showing up as cargo nodes 2020-08-17 17:31:15 +02:00
TheBusyBiscuit
fb47574fe8
Added poma's requested change
Co-authored-by: poma123 <25465545+poma123@users.noreply.github.com>
2020-08-17 16:27:26 +02:00
TheBusyBiscuit
a10813036b
Added poma's suggested change
Co-authored-by: poma123 <25465545+poma123@users.noreply.github.com>
2020-08-17 13:30:18 +02:00
TheBusyBiscuit
0f73b62658
Added Walshys suggested change
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
2020-08-17 13:30:03 +02:00
TheBusyBiscuit
07c62d5932
Added Walshys suggested change
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
2020-08-17 13:29:54 +02:00
TheBusyBiscuit
33f6f039ec
Added Walshys suggested change
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
2020-08-17 13:29:44 +02:00
Scott Gomez Andoy
646fb6d523 Translate messages_tl.yml via GitLocalize 2020-08-17 11:26:10 +00:00
TheBusyBiscuit
d4953dd029 [CI skip] Added more Unit Tests 2020-08-17 13:00:22 +02:00
TheBusyBiscuit
0d27a787ab Added a new config option for setting Players on fire when radioactive 2020-08-17 02:23:59 +02:00
TheBusyBiscuit
1bba2efa3e [CI skip] Added more unit tests 2020-08-17 02:23:28 +02:00
TheBusyBiscuit
7a31c88ce9 Fixes #2207 2020-08-17 00:32:18 +02:00
TheBusyBiscuit
c98fe74ea9
Merge branch 'master' into NitwitRune 2020-08-17 00:25:18 +02:00
dniym
42e4b1620d
Update SlimefunItemSetup.java
Fixed merge conflict 2
2020-08-16 13:52:09 -04:00
dniym
45b63a149b
Update HeadTexture.java
Resolved Merge Conflict 1
2020-08-16 13:45:18 -04:00
dniym
b22bdb55ff Made requested changes 2020-08-16 13:33:36 -04:00
TheBusyBiscuit
2a8abcbdbf Fixed unit tests, also improved test coverage 2020-08-16 15:57:09 +02:00
TheBusyBiscuit
037e8d83df Small performance improvement, also reduced technical debt a bit 2020-08-16 15:49:47 +02:00
Luu7
9a6b8d697d Translate messages_es.yml via GitLocalize 2020-08-14 21:53:14 +00:00
TheBusyBiscuit
bae8421511 Translate messages_de.yml via GitLocalize 2020-08-13 23:51:00 +00:00
TheBusyBiscuit
8b02c18bb4 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-08-14 01:46:25 +02:00
TheBusyBiscuit
eb5b2678e0 Fixes #2077 2020-08-14 01:46:05 +02:00
dniym
644878c534 Made Requested Changes 2020-08-13 16:21:18 -04:00
LinoxGH
acfc3c6880 Translate messages_tr.yml via GitLocalize 2020-08-13 19:53:13 +00:00
TheBusyBiscuit
c0d18c5c89 Fixes #2217 2020-08-13 21:13:19 +02:00
dniym
a33cfdb12d added a check for jobless villagers 2020-08-12 16:08:15 -04:00
dniym
a1be08034b made requested changes 2020-08-12 16:04:35 -04:00
dniym
b27059240b Added Rune of Unemployment
Approved Suggestion: #284 - Vitamin_CE#9804
2020-08-11 20:58:17 -04:00
TheBusyBiscuit
923b59c6e7 [CI skip] Reduced technical debt 2020-08-11 16:28:52 +02:00
TheBusyBiscuit
e406481b98 [CI skip] Replaced the last tabs with spaces 2020-08-11 16:23:31 +02:00
TheBusyBiscuit
1aaedf0825 [CI skip] Added more Unit Tests 2020-08-11 11:17:08 +02:00
Nameless
517bd6139e Translate messages_zh-CN.yml via GitLocalize 2020-08-10 06:47:24 +00:00
LinoxGH
9175f27fdd Translate messages_tr.yml via GitLocalize 2020-08-09 14:59:09 +00:00
Luu7
adddf4811d Translate messages_es.yml via GitLocalize 2020-08-09 13:07:04 +00:00
TheBusyBiscuit
bb40017985 Translate messages_de.yml via GitLocalize 2020-08-09 09:48:03 +00:00
TheBusyBiscuit
e4f5ea62d9 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-08-09 11:44:03 +02:00
TheBusyBiscuit
485a80f6ef Fixes #2209 2020-08-09 11:41:15 +02:00
TheBusyBiscuit
66f4c48b4b Fixes #2205 2020-08-09 11:33:48 +02:00
TheBusyBiscuit
e6958f8e34
[CI skip] Merge pull request #2210 from TheBusyBiscuit/gitlocalize-12575
Updated messages_zh-CN.yml
2020-08-09 11:20:57 +02:00
Nameless
af32c0ed4a Translate recipes_zh-CN.yml via GitLocalize 2020-08-09 08:20:48 +00:00
Nameless
a3f58150ee Translate messages_zh-CN.yml via GitLocalize 2020-08-09 08:17:17 +00:00
TheBusyBiscuit
7de9dd6683 Industrial Miners can now also mine Gilded Blackstone 2020-08-08 12:51:26 +02:00
TheBusyBiscuit
9f49dd3981 Reduced technical debt 2020-08-08 12:47:39 +02:00
TheBusyBiscuit
c08eadcaae Small performance improvement 2020-08-08 00:48:09 +02:00
TheBusyBiscuit
bffbb488ba [CI skip] Added Unit Tests for Piglins 2020-08-08 00:45:01 +02:00
poma123
c2fa590aa1
Requested changes 2020-08-07 22:43:58 +02:00
poma123
6ab196a03d
Requested changes 2020-08-07 22:04:15 +02:00
poma123
87f8e7ae8c
Fixed Industrial Miner debris issue 2020-08-07 21:46:59 +02:00
TheBusyBiscuit
9b21c1ade1
Merge pull request #2202 from dniym/elecPressSand
Elec press sand
2020-08-07 19:10:11 +02:00
TheBusyBiscuit
99d07c42e5 [CI skip] Update MockBukkit 2020-08-07 19:05:51 +02:00
dniym
1fde84a4c7 Approved Suggestion #272 - AutoBio#8746 2020-08-06 21:08:59 -04:00
TheBusyBiscuit
9de72881ab [CI skip] Fixed some URLs 2020-08-07 00:31:09 +02:00
TheBusyBiscuit
d55a546c42 Fixes #2168 2020-08-06 16:24:41 +02:00
Vravinite
b0c040ea7a Translate recipes_es.yml via GitLocalize 2020-08-06 07:47:06 +00:00
Luu7
4a45757a53 Translate messages_es.yml via GitLocalize 2020-08-06 07:47:03 +00:00
Luu7
33d802b940 Translate researches_es.yml via GitLocalize 2020-08-06 07:47:02 +00:00
TheBusyBiscuit
8d7d157503 Improved documentation 2020-08-06 00:54:49 +02:00
TheBusyBiscuit
ef01c85888 Some refactoring, requested changes 2020-08-06 00:30:33 +02:00
TheBusyBiscuit
dde0ab7de6
[CI skip] Merge pull request #2197 from TheBusyBiscuit/gitlocalize-12544
Updated hungarian translations
2020-08-05 23:39:44 +02:00
TheBusyBiscuit
94843c79c0
[CI skip] Merge pull request #2196 from TheBusyBiscuit/gitlocalize-12540
Update Japanese translation
2020-08-05 23:39:18 +02:00
TheBusyBiscuit
a032d151f1
[CI skip] Merge pull request #2195 from TheBusyBiscuit/gitlocalize-12539
Updated TR localization
2020-08-05 23:38:52 +02:00
TheBusyBiscuit
e758be8d3c
[CI skip] Merge pull request #2194 from TheBusyBiscuit/gitlocalize-12538
Tagalog/Filipino Translation Update
2020-08-05 23:38:28 +02:00
poma123
f89f3a35bb Translate messages_hu.yml via GitLocalize 2020-08-05 21:36:36 +00:00
András Marczinkó
9594046bd5 Translate recipes_hu.yml via GitLocalize 2020-08-05 21:36:35 +00:00
TheBusyBiscuit
c2cc7ab96c Translate messages_ja.yml via GitLocalize 2020-08-05 15:38:07 +00:00
LinoxGH
cd7a94516a Translate messages_tr.yml via GitLocalize 2020-08-05 15:06:58 +00:00
Scott Gomez Andoy
a0fe200948 Translate messages_tl.yml via GitLocalize 2020-08-05 14:54:16 +00:00
TheBusyBiscuit
3d8e01e6f2 Translate messages_de.yml via GitLocalize 2020-08-05 14:52:33 +00:00
TheBusyBiscuit
46a01c368f
Merge pull request #2192 from poma123/fix/brewing
Fixed prevent Slimefun items from being added to a Brewing Stand
2020-08-05 16:49:54 +02:00
TheBusyBiscuit
32849ca563
Merge branch 'master' into refactoring/block-energy 2020-08-05 16:45:34 +02:00
TheBusyBiscuit
7c3599c862 [CI skip] Reduced technical debt 2020-08-05 16:44:43 +02:00
TheBusyBiscuit
c168497e79 [CI skip] Reduced technical debt 2020-08-05 13:31:35 +02:00
poma123
9454c890ea Refactoring 2020-08-05 13:02:35 +02:00
poma123
6de4130d05 Fixed prevention when brewing with slimefun items 2020-08-05 12:41:48 +02:00
TheBusyBiscuit
f50d1d2faa Big performance improvements to Enhanced Furnaces when using Paper 2020-08-04 20:15:21 +02:00
TheBusyBiscuit
c56ebe9c23
Merge branch 'master' into IcePick 2020-08-04 19:12:00 +02:00
TheBusyBiscuit
18036aa181
Added a new entry to SlimefunItems.java 2020-08-04 19:07:00 +02:00
TheBusyBiscuit
f8a988261f
Fixed typo 2020-08-04 19:03:20 +02:00
TheBusyBiscuit
3adb634d8b
Make it not override the vanilla item anymore 2020-08-04 19:02:53 +02:00
TheBusyBiscuit
f9e9a7c491
Updated research id to not break compatibility 2020-08-04 19:00:38 +02:00
TheBusyBiscuit
06f64725d9 Improved performance for idling Enhanced Furnaces on Paper 2020-08-04 18:00:31 +02:00
TheBusyBiscuit
9719058bbc Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-08-04 17:59:55 +02:00
TheBusyBiscuit
35684b60fc Optimized performance for rainbow blocks 2020-08-04 17:59:41 +02:00
TheBusyBiscuit
d80fdac23b Fixed debug fish 2020-08-04 15:49:58 +02:00
TheBusyBiscuit
b6ba6ce754 Updated all electric machines 2020-08-04 15:43:00 +02:00
Scott Gomez Andoy
927eefd63c Translate recipes_tl.yml via GitLocalize 2020-08-04 12:46:42 +00:00
TheBusyBiscuit
bc387ee47a Updated EnergyNet code 2020-08-04 13:50:22 +02:00
TheBusyBiscuit
368d2f5798 Move block energy code to EnergyNetComponent 2020-08-04 13:29:45 +02:00
TheBusyBiscuit
736b48a799
Merge pull request #2188 from TheBusyBiscuit/gitlocalize-12525
Added korean as a language
2020-08-04 12:54:45 +02:00
TheBusyBiscuit
14f0b0f3fe
[CI skip] Merge pull request #2186 from TheBusyBiscuit/gitlocalize-12523
Updated german translation
2020-08-04 12:54:20 +02:00
TheBusyBiscuit
8faf505999
Mark Korean as done 2020-08-04 12:50:48 +02:00
kwonms871
b41ef97859 Translate messages_ko.yml via GitLocalize 2020-08-04 10:48:38 +00:00
LinoxGH
bdde1d9745 Translate recipes_tr.yml via GitLocalize 2020-08-04 10:45:39 +00:00
TheBusyBiscuit
c2443a4df2 Translate recipes_de.yml via GitLocalize 2020-08-04 10:44:15 +00:00
TheBusyBiscuit
e870f82afd Added piglin bartering to translation files 2020-08-04 12:40:08 +02:00
TheBusyBiscuit
8a9dfe25a8 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-08-04 12:30:30 +02:00
TheBusyBiscuit
dbed8b55d9
[CI skip] Merge pull request #2136 from dniym/PiglinDropsFgithub
Piglin drops fgithub
2020-08-04 12:25:26 +02:00
TheBusyBiscuit
0ff5fc7251 Small performance improvements for miner talismans 2020-08-04 10:19:24 +02:00
TheBusyBiscuit
eecdb61223 Fixed compilation 2020-08-04 09:53:50 +02:00
TheBusyBiscuit
04a71a2408 Merge branch 'cleanup/blockplacing' of https://github.com/TheBusyBiscuit/Slimefun4 into cleanup/blockplacing 2020-08-04 09:52:59 +02:00
TheBusyBiscuit
7cc795f30e One more change 2020-08-04 09:52:53 +02:00
TheBusyBiscuit
54aa45d1d2
Merge branch 'master' into cleanup/blockplacing 2020-08-04 09:47:51 +02:00
TheBusyBiscuit
484c7a22ec Fixes #2180 2020-08-04 09:46:35 +02:00
TheBusyBiscuit
f409b869ae Small performance optimization for bows 2020-08-04 09:46:04 +02:00
TheBusyBiscuit
137e91ad12
Fixes #2181 2020-08-04 01:16:20 +02:00
TheBusyBiscuit
8f289dcdbe Fixes #2181 2020-08-04 01:15:14 +02:00
TheBusyBiscuit
56b78eac61 Fixes #2183 2020-08-04 00:58:43 +02:00
TheBusyBiscuit
cafa66b1a8 Fixes #2184 2020-08-04 00:48:23 +02:00
TheBusyBiscuit
012a0a7df9 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4
into cleanup/blockplacing

Conflicts:
	CHANGELOG.md
2020-08-03 17:28:17 +02:00
TheBusyBiscuit
d8f5992282 Fixes #2103 2020-08-03 17:25:27 +02:00
TheBusyBiscuit
8d1e427409 A few more changes 2020-08-03 00:30:58 +02:00
dniym
17f84bcffd
Update PiglinBarterDrop.java
done
2020-08-02 17:44:57 -04:00
dniym
ecb3a354ff
Update PiglinBarterDrop.java
fixed
2020-08-02 17:44:11 -04:00
dniym
9287e1098d
Update PiglinListener.java
fixed
2020-08-02 17:43:26 -04:00
TheBusyBiscuit
1aeba31a96 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4
into cleanup/blockplacing

Conflicts:
	CHANGELOG.md
2020-08-02 23:15:05 +02:00
dniym
21305ddfdb
Update PiglinListener.java
fixed a compile error
2020-08-02 16:37:19 -04:00
dniym
9edc082230
Update PiglinBarterDrop.java 2020-08-02 16:29:08 -04:00
dniym
c2376b90b3
Update PiglinListener.java
made requested changes.
2020-08-02 16:25:39 -04:00
Lleyton Gray
43838d7270
Applying suggestion
Signed-off-by: Lleyton Gray <lleyton@innatical.com>
2020-08-02 13:07:55 -07:00
TheBusyBiscuit
1389085932 Fixed Reinforced Spawners 2020-08-02 22:01:32 +02:00
Lleyton Gray
3703aaa993
Add ItemSetting for toggling mining of Ancient Debris.
Signed-off-by: Lleyton Gray <lleyton@innatical.com>
2020-08-02 12:52:16 -07:00
TheBusyBiscuit
d20650855c Fixes #2179 2020-08-02 21:45:58 +02:00
TheBusyBiscuit
b26f2a1ca8 Merge branch 'cleanup/blockplacing' of https://github.com/TheBusyBiscuit/Slimefun4 into cleanup/blockplacing 2020-08-02 21:37:03 +02:00
TheBusyBiscuit
a0b9579514 Added ToolUseHandler 2020-08-02 21:36:49 +02:00
lleyton
4c2b6bd1e7
Merge pull request #1 from TheBusyBiscuit/master
Sync Upstream with Fork
2020-08-02 12:18:47 -07:00
dniym
eed7b873c7
Update PiglinBarterDrop.java
made requested changes
2020-08-02 11:46:46 -04:00
dniym
8305729cfb
Update RandomMobDrop.java
made requested changes.
2020-08-02 11:45:19 -04:00
TheBusyBiscuit
6608c3c5d7
Merge branch 'master' into cleanup/blockplacing 2020-08-02 17:43:08 +02:00
TheBusyBiscuit
f32280a4ce Fixes #2176 2020-08-02 17:39:09 +02:00
TheBusyBiscuit
6573a60016 Another commit full of cleanup stuff 2020-08-02 15:16:21 +02:00
TheBusyBiscuit
23d730cd7a Some more refactoring 2020-08-02 14:04:24 +02:00
TheBusyBiscuit
bf65b310aa Fixes #2147 2020-08-02 13:55:58 +02:00
TheBusyBiscuit
34b82d7a6f Fixes #2164 2020-08-02 13:55:31 +02:00
kudansul
f3191658b8 Translate researches_ko.yml via GitLocalize 2020-08-02 11:46:07 +00:00
TheBusyBiscuit
e52d062ef5 Reduced technical debt and clutter 2020-08-02 11:22:00 +02:00
Lleyton Gray
fadb31feb1
Allow Ancient Debris to be mined by Industrial Miners 2020-08-01 20:47:43 -07:00
TheBusyBiscuit
0f924e485b
[CI skip] Merge pull request #2159 from TheBusyBiscuit/gitlocalize-12482
Categories_it
2020-08-01 16:58:41 +02:00
TheBusyBiscuit
c8c3edb66c
[CI skip] Merge pull request #2157 from TheBusyBiscuit/gitlocalize-12480
Researches_it
2020-08-01 16:58:26 +02:00
TheBusyBiscuit
a472097798 Fixed androids rotating to the wrong side 2020-08-01 16:16:15 +02:00
TheBusyBiscuit
72a3f59d4b Removed a deprecated method 2020-08-01 15:56:14 +02:00
TheBusyBiscuit
6580e82606 Removed deprecated things 2020-08-01 12:31:05 +02:00
TheBusyBiscuit
c510a8708c Performance improvements for androids 2020-08-01 12:25:47 +02:00
TheBusyBiscuit
76362b2acb Fixes #2166 2020-08-01 00:17:43 +02:00
TheBusyBiscuit
2fc18aed0a Fixes #2162 2020-07-31 20:24:58 +02:00
TheBusyBiscuit
e380f8b972 Fixes #2165 2020-07-31 20:18:51 +02:00
TheBusyBiscuit
446191d4bf Fixes #2156 2020-07-31 20:14:48 +02:00
prolletto64
bf3a0391d0 Translate categories_it.yml via GitLocalize 2020-07-31 13:43:17 +00:00
prolletto64
db424e0437 Translate researches_it.yml via GitLocalize 2020-07-31 13:41:59 +00:00
dniym
80ee551ca2 Made requested changes. 2020-07-30 20:14:14 -04:00
Scott Gomez Andoy
5d22bfb109 Translate recipes_tl.yml via GitLocalize 2020-07-30 23:59:34 +00:00
TheBusyBiscuit
df4f316675 Minor change 2020-07-31 01:39:10 +02:00
TheBusyBiscuit
90685edae6 Added a permission node for the debug fish 2020-07-31 01:32:43 +02:00
TheBusyBiscuit
dcb00dff20 [CI skip] Reduced technical debt 2020-07-31 01:08:23 +02:00
TheBusyBiscuit
2f05b9e4f8 Various fixes and performance improvements, mainly for talismans 2020-07-30 17:20:21 +02:00
SoSeDiK
8ddb055083 Translate researches_ru.yml via GitLocalize 2020-07-30 11:45:13 +00:00
SoSeDiK
2999e777f9 Translate messages_ru.yml via GitLocalize 2020-07-30 11:45:09 +00:00
TheBusyBiscuit
771456b6cd [CI skip] Fixed some malformed yaml 2020-07-30 13:30:20 +02:00
TheBusyBiscuit
a363cd1f5f
[CI skip] Removed trailing-spaces from config 2020-07-30 13:24:56 +02:00
TheBusyBiscuit
0412a2aec1 Fixes #2151 2020-07-30 10:23:44 +02:00
TheBusyBiscuit
ce18519808 Re-added conditional github warning messages 2020-07-29 23:21:41 +02:00
TheBusyBiscuit
ac4cfd3d68 Fixes #2145 2020-07-29 21:57:08 +02:00
TheBusyBiscuit
5a1b868c91 Fixed Metrics 2020-07-29 13:13:48 +02:00
TheBusyBiscuit
eb8e689d2c Fixes #2143 2020-07-29 13:03:52 +02:00
TheBusyBiscuit
8f2dc7cebc [Ci skip] Fixed formatting 2020-07-29 12:39:04 +02:00
TheBusyBiscuit
aba4019da0 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-07-29 12:37:33 +02:00
TheBusyBiscuit
2c3343ac5f [Ci skip] Fixed Metrics? 2020-07-29 12:37:16 +02:00
Nameless
08412f3c6c Translate researches_zh-CN.yml via GitLocalize 2020-07-28 01:16:18 +00:00
Nameless
641d24d48d Translate messages_zh-CN.yml via GitLocalize 2020-07-28 01:16:15 +00:00
TheBusyBiscuit
3573628621 Translate messages_hu.yml via GitLocalize 2020-07-26 23:00:23 +00:00