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

4263 Commits

Author SHA1 Message Date
TheBusyBiscuit
d998f3ec8c
Merge branch 'master' into refactoring/block-energy 2020-08-24 02:11:59 +02:00
TheBusyBiscuit
bab5f8a9b5
Merge pull request #2246 from Sfiguz7/master
Sf give drops excess items
2020-08-23 17:54:14 +02:00
Sfiguz7
89fdf45d28 I said, fixed extra indentation 2020-08-23 17:50:31 +02:00
Sfiguz7
44451d6244 Fixed extra indentation 2020-08-23 17:49:44 +02:00
Sfiguz7
813200b29c Made requested changes 2020-08-23 15:36:10 +02:00
TheBusyBiscuit
49573ad55b
[CI skip] Merge pull request #2244 from TheBusyBiscuit/renovate/com.konghq-unirest-java-3.x
Update dependency com.konghq:unirest-java to v3.10.00
2020-08-23 14:12:11 +02:00
TheBusyBiscuit
b12a2537d4
[CI skip] Merge pull request #2242 from TheBusyBiscuit/renovate/org.mockito-mockito-core-3.x
Update dependency org.mockito:mockito-core to v3.5.5
2020-08-23 14:11:31 +02:00
Sfiguz7
e06d17f8e5 Restored original plugin.yml as pulling hadn't 2020-08-23 13:58:29 +02:00
Sfiguz7
bdd2adc21e Cleared unused imports I forgot to delete 2020-08-23 13:56:39 +02:00
Sfiguz7
eb66f3e183 Added option to drop excess items on /sf give 2020-08-23 13:54:51 +02:00
Renovate Bot
69a3c227dc
Update dependency com.konghq:unirest-java to v3.10.00 2020-08-22 22:08:54 +00:00
Renovate Bot
2db1466807
Update dependency org.mockito:mockito-core to v3.5.5 2020-08-22 21:39:29 +00:00
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
TheBusyBiscuit
e1b619c89a
[CI skip] Merge pull request #2236 from TheBusyBiscuit/gitlocalize-12701
Updated czech translations
2020-08-21 15:29:16 +02:00
TheBusyBiscuit
9c2ee63392 Translate messages_cs.yml via GitLocalize 2020-08-21 13:27:23 +00: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
88be3e79ff
Merge branch 'master' into refactoring/block-energy 2020-08-20 16:55:35 +02:00
TheBusyBiscuit
1a8dbb587a
[CI skip] Merge pull request #2233 from TheBusyBiscuit/gitlocalize-12678
messges_es
2020-08-20 09:20:38 +02:00
Luu7
fc7587b517 Translate messages_es.yml via GitLocalize 2020-08-19 23:50:05 +00:00
Vravinite
310622c3ac Translate messages_es.yml via GitLocalize 2020-08-19 23:50:04 +00:00
TheBusyBiscuit
3feb16e9e4
[CI skip] Merge pull request #2232 from TheBusyBiscuit/gitlocalize-12661
Updated TR localization
2020-08-19 14:43:53 +02:00
LinoxGH
5f0df75b81 Translate messages_tr.yml via GitLocalize 2020-08-19 12:42:33 +00:00
LinoxGH
04214ed113 Translate recipes_tr.yml via GitLocalize 2020-08-19 12:42:32 +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
f84a69b77f
[CI skip] Merge pull request #2231 from TheBusyBiscuit/gitlocalize-12660
Updated german translations
2020-08-19 14:35:48 +02:00
TheBusyBiscuit
15487fb333 Translate messages_de.yml via GitLocalize 2020-08-19 12:33:36 +00:00
SoSeDiK
273e459e26 Translate recipes_ru.yml via GitLocalize 2020-08-19 12:20:10 +00:00
TheBusyBiscuit
4429bd3c70 Translate messages_ru.yml via GitLocalize 2020-08-19 12:20:09 +00:00
SoSeDiK
dbd5cc1641 Translate messages_ru.yml via GitLocalize 2020-08-19 12:20:08 +00:00
TheBusyBiscuit
aa22e7c9b2 [CI skip] A bit of refactoring and documentation 2020-08-19 13:54:46 +02:00
TheBusyBiscuit
21c97eba9a Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-08-19 11:00:12 +02:00
TheBusyBiscuit
5c5c20ff23
[CI skip] Merge pull request #2229 from TheBusyBiscuit/renovate/org.mockito-mockito-core-3.x
Update dependency org.mockito:mockito-core to v3.5.2
2020-08-19 10:26:42 +02:00
Renovate Bot
9f4c34e826
Update dependency org.mockito:mockito-core to v3.5.2 2020-08-18 21:24:32 +00: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
925ade1d04
[CI skip] Merge pull request #2227 from TheBusyBiscuit/gitlocalize-12643
Tagalog/Filipino Translation Update
2020-08-17 13:28:35 +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
2a8abcbdbf Fixed unit tests, also improved test coverage 2020-08-16 15:57:09 +02:00
TheBusyBiscuit
aaba3ae777
[CI skip] Merge pull request #2226 from TheBusyBiscuit/renovate/org.mockito-mockito-core-3.x
Update dependency org.mockito:mockito-core to v3.5.0
2020-08-16 15:53:59 +02:00
TheBusyBiscuit
4911b8a5b6
[CI skip] Added another url to be excluded 2020-08-16 15:53:40 +02:00