mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 11:45:51 +00:00
Code Releases Activity
3,478 Commits 1 Branch 0 Tags 64 MiB
62ffb59ba2
Commit Graph

3478 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
clement.gallois@epitech.eu
6ce560bdfe Resolves #1843 2020-05-02 00:01:01 +02:00
TheBusyBiscuit
2a595dd408
[CI skip] Updated README 2020-05-01 19:10:52 +02:00
TheBusyBiscuit
6a0d3a1f45
[CI skip] Update README 2020-05-01 18:57:59 +02:00
TheBusyBiscuit
085d10be0a Maybe resolves #1834 2020-05-01 11:25:42 +02:00
TheBusyBiscuit
189507844d
[CI skip] Merge pull request #1839 from TheBusyBiscuit/gitlocalize-11547 
Updated czech translations
 2020-05-01 11:22:36 +02:00
LirCZE
f0e6b85593 Translate messages_cs.yml via GitLocalize 2020-04-30 19:14:32 +00:00
jakmanda05
8ebc23b5c9 Translate messages_cs.yml via GitLocalize 2020-04-30 19:14:31 +00:00
TheBusyBiscuit
3467f1b3ce Translate messages_cs.yml via GitLocalize 2020-04-30 19:14:30 +00:00
100petr
7bedde4f0c Translate messages_cs.yml via GitLocalize 2020-04-30 19:14:29 +00:00
TheBusyBiscuit
e57e4c8219 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-04-30 20:51:40 +02:00
TheBusyBiscuit
8cb5579a12 Fixes #1833 2020-04-30 20:51:17 +02:00
TheBusyBiscuit
a996771b7d
[CI skip] Merge pull request #1838 from TheBusyBiscuit/gitlocalize-11546 
Completed recipes_it
 2020-04-30 17:43:29 +02:00
Sfiguz7
c7f846640d Translate recipes_it.yml via GitLocalize 2020-04-30 15:26:26 +00:00
TheBusyBiscuit
da2dc039de
[CI skip] Merge pull request #1837 from TheBusyBiscuit/gitlocalize-11545 
Completed categories_it
 2020-04-30 17:22:44 +02:00
Sfiguz7
2922422d88 Translate categories_it.yml via GitLocalize 2020-04-30 15:20:44 +00:00
TheBusyBiscuit
ba762b9dea
[CI skip] Merge pull request #1836 from TheBusyBiscuit/gitlocalize-11542 
Fix translate error
 2020-04-30 17:18:19 +02:00
0XPYEX0
03a293fc40 Translate researches_zh-CN.yml via GitLocalize 2020-04-30 09:17:02 +00:00
TheBusyBiscuit
2b9d109d16 Bandages, Rags and Splints will no longer be consumed if at full health 2020-04-26 16:08:01 +02:00
TheBusyBiscuit
2f188338fc
[CI skip] This should work now 2020-04-26 16:06:08 +02:00
TheBusyBiscuit
d3cbdb677d
[CI skip] Another test 2020-04-26 16:04:14 +02:00
TheBusyBiscuit
38eef9da86
[CI skip] test 2020-04-26 16:02:04 +02:00
TheBusyBiscuit
5cf965bc65
[CI skip] Updated workflow 2020-04-26 16:00:44 +02:00
TheBusyBiscuit
7be0142ef0
Update duplicates.yml 2020-04-26 16:00:09 +02:00
TheBusyBiscuit
f1bfac4aea [CI skip] Added new workflow for duplicate issues 2020-04-26 15:58:22 +02:00
TheBusyBiscuit
804e450f51 Only retry Mojang lookups if it was rate-limiting 2020-04-26 15:51:12 +02:00
TheBusyBiscuit
ec96e13c82 [CI Skip] Refactoring 2020-04-26 13:50:37 +02:00
TheBusyBiscuit
4cc6a02835
Merge pull request #1827 from TheBusyBiscuit/revert-1826-patch-6 
Revert "Easier to register items"
 2020-04-25 23:13:12 +02:00
TheBusyBiscuit
15b64fc1d5
Revert "Easier to register items" 2020-04-25 23:13:00 +02:00
TheBusyBiscuit
f4c52505f3
Merge pull request #1826 from WalshyDev/patch-6 
Easier to register items
 2020-04-25 23:00:37 +02:00
Daniel Walsh
a3f7c2dc46
Chaining whooo 2020-04-25 21:57:46 +01:00
Daniel Walsh
15b6e3fa31
Easier to register items 
Instead of having to do registerResearch(Research, ItemStack...) you can just do new Research(..., items).register()

Makes this more consistent with the other registering too.
 2020-04-25 21:28:04 +01:00
TheBusyBiscuit
9eb9a98410 Fixes #1824 2020-04-25 19:14:50 +02:00
TheBusyBiscuit
f18cb33eef [CI skip] Reduced technical debt 2020-04-25 13:01:32 +02:00
TheBusyBot
9e80e55ada [CI skip] Updated Changelog 2020-04-25 10:07:59 +00:00
TheBusyBiscuit
90812f7828 [CI skip] Updated README 2020-04-25 12:07:36 +02:00
TheBusyBiscuit
45ed89c6f5 Bugged Generators from Addons will no longer destroy Energy Regulators 2020-04-25 02:16:21 +02:00
TheBusyBiscuit
0116d19f33
[CI skip] Updated change log for new release 2020-04-24 12:48:27 +02:00
TheBusyBiscuit
d896462c2d Fixed Emergency Transmitters + Reduced technical debt 2020-04-23 18:08:15 +02:00
TheBusyBiscuit
a04676b27c Various improvements, including Pull Request #1790 2020-04-23 13:01:47 +02:00
TheBusyBiscuit
dfb47ddfbb
[CI skip] Merge pull request #1790 from DNx5/master 
Cargo Network - optimization
 2020-04-23 11:28:43 +02:00
DNx5
5cf0487cb7 Moved the tick delay value into static constant 2020-04-22 07:54:34 +07:00
DNx5
034ff1948a missed a spot 2020-04-22 06:32:53 +07:00
DNx5
81add1caa2 code cleanup 2020-04-22 06:18:42 +07:00
DNx5
2a22eebd8a Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 
 Conflicts:
	pom.xml
 2020-04-22 06:16:35 +07:00
DNx5
92e8aa955b - Get the tick delay value directly in method 
- Added comment to explain how the skipping ticks work
 2020-04-22 06:16:03 +07:00
TheBusyBiscuit
ca6170e64b Fixes #1490 2020-04-21 21:07:05 +02:00
TheBusyBiscuit
1baefd37b0 Updated dependency 2020-04-21 20:28:26 +02:00
TheBusyBiscuit
9aa6fa68ca [CI skip] Reduced technical debt 2020-04-21 20:25:46 +02:00
TheBusyBiscuit
485cde8c90 Added stronger state preservation to the BlockMenuPreset class 2020-04-21 20:25:33 +02:00
TheBusyBiscuit
b013247ea2 Fixes #1798 2020-04-21 01:48:22 +02:00