mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 19:55:48 +00:00
Code Releases Activity
3,276 Commits 1 Branch 0 Tags 64 MiB
0292ee6cec
Commit Graph

1303 Commits

Author SHA1 Message Date
TheBusyBiscuit
1646d7c82d Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 
into tests

Conflicts:
	src/main/java/me/mrCookieSlime/Slimefun/api/Slimefun.java
 2020-05-09 18:24:11 +02:00
TheBusyBiscuit
c93c6cfa68 Small refactoring 2020-05-09 18:00:10 +02:00
jacky
d806837000 Fixes Prismarine Brick duplication bug with Grind Stone #1851 2020-05-09 22:04:27 +08:00
jacky
e329560d6d Revert "Fixes Prismarine Brick duplication bug with Grind Stone #1829" 
This reverts commit cd0baa30
 2020-05-09 22:04:07 +08:00
jacky
cd0baa307e Fixes Prismarine Brick duplication bug with Grind Stone #1829 2020-05-09 21:22:25 +08:00
TheBusyBiscuit
0e6ce77fd8 Deprecated these methods again 2020-05-09 10:51:55 +02:00
TheBusyBiscuit
cf777126ba [CI skip] Deprecated two methods because the Research class will move 2020-05-09 10:48:02 +02:00
TheBusyBiscuit
922444c046 Added new api method for researches 2020-05-09 10:41:36 +02:00
TheBusyBiscuit
c4026966a2 Removed api method 2020-05-09 10:35:21 +02:00
TheBusyBiscuit
d8c06a2270 Updated repository names 2020-05-09 10:17:04 +02:00
TheBusyBiscuit
b30190da5c Refactoring 2020-05-08 23:05:29 +02:00
TheBusyBiscuit
5360e4d085 MOOORE Unit Tests 2020-05-08 22:09:08 +02:00
TheBusyBiscuit
974657fadc Fixed some unit tests 2020-05-08 21:26:18 +02:00
TheBusyBiscuit
cc21fb8fe3 Removed temporary migration method 2020-05-08 19:21:49 +02:00
TheBusyBiscuit
a37fe6d62a disabledItems now also uses the Worlds UUID 2020-05-08 19:07:06 +02:00
TheBusyBiscuit
ebf6725d7e Prevent World Settings from saving inside tests 2020-05-08 19:05:03 +02:00
TheBusyBiscuit
eb321e9ee5 Lots more refactoring 2020-05-08 18:59:51 +02:00
TheBusyBiscuit
dc137d04bf Player Profiles are now truly asynchronous 2020-05-08 18:47:25 +02:00
TheBusyBiscuit
a4ebd663d5 Refactoring and Research Unit tests 2020-05-08 17:55:48 +02:00
TheBusyBiscuit
aa897a5de7 More tests and relocated a class 2020-05-08 17:13:16 +02:00
TheBusyBiscuit
a2512ce03a Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 into tests 2020-05-08 16:00:31 +02:00
TheBusyBiscuit
c3dbe8f34a Maybe fixed the Electric Smeltery recipe priorities 2020-05-08 15:54:14 +02:00
TheBusyBiscuit
66ac945b5f No such thing as too many Unit Tests 2020-05-08 15:44:12 +02:00
TheBusyBiscuit
a3afe615b5 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 into tests 2020-05-07 20:39:42 +02:00
TheBusyBiscuit
528edc80d0 Fixes #1873 2020-05-07 20:38:51 +02:00
TheBusyBiscuit
de1af960bb [CI skip] Updated translator list 2020-05-07 20:35:03 +02:00
TheBusyBiscuit
51708d1eb1
[CI skip] Merge pull request #1887 from TheBusyBiscuit/gitlocalize-11632 
Added bulgarian categories
 2020-05-07 20:34:47 +02:00
TheBusyBiscuit
2d3cfaee73 Updated PerWorldSettings 2020-05-07 20:32:37 +02:00
DNBGlol
97b352b4bc Translate categories_bg.yml via GitLocalize 2020-05-07 18:29:47 +00:00
Silent
0db56b4e7c Translate recipes_mk.yml via GitLocalize 2020-05-07 18:29:28 +00:00
TheBusyBiscuit
9e63f1ce79 Added Unit Tests for Categories 2020-05-07 19:56:45 +02:00
TheBusyBiscuit
220d5ef41f Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 
into tests

Conflicts:
	CHANGELOG.md
 2020-05-07 18:18:09 +02:00
TheBusyBiscuit
0b416c3201 More tests 2020-05-07 18:00:44 +02:00
TheBusyBiscuit
41b0356bbc Refactoring 2020-05-07 18:00:30 +02:00
Luu7
8d26c83304 Translate messages_es.yml via GitLocalize 2020-05-07 15:34:48 +00:00
TheBusyBiscuit
8577b9ef50 Added Unit Tests for ItemSetting<T> 2020-05-07 17:12:31 +02:00
TheBusyBiscuit
7e04566393 Further unit tests and jacoco coverage reports 2020-05-07 14:28:54 +02:00
KillerXCoder
5845b224e4 Translate messages_sk.yml via GitLocalize 2020-05-07 09:58:21 +00:00
KillerXCoder
558c440fad Translate recipes_sk.yml via GitLocalize 2020-05-07 09:55:06 +00:00
TheBusyBiscuit
b456da9ffc First Unit Tests 2020-05-06 22:08:15 +02:00
mt-gitlocalize
1e67550118 Translate recipes_ko.yml via GitLocalize 2020-05-05 17:36:24 +00:00
AOJUCBJD
be8f7d9b1b Translate recipes_ko.yml via GitLocalize 2020-05-05 17:36:22 +00:00
kwonms871
14a9f9dde6 Translate recipes_ko.yml via GitLocalize 2020-05-05 17:36:20 +00:00
TheBusyBiscuit
6d569f0ead
[CI skip] Merge pull request #1871 from TheBusyBiscuit/gitlocalize-11581 
Translated recipes to Ukrainian
 2020-05-04 21:22:12 +02:00
TheBusyBiscuit
6565b861f2
[CI skip] Merge pull request #1861 from TheBusyBiscuit/gitlocalize-11569 
Added Ukrainian categories
 2020-05-04 21:22:01 +02:00
TheBusyBiscuit
98406fe9a5
[CI skip] Merge pull request #1868 from TheBusyBiscuit/gitlocalize-11577 
Translated researches to Ukrainian
 2020-05-04 21:21:51 +02:00
TheBusyBiscuit
352ca54b37
[CI skip] Merge pull request #1859 from TheBusyBiscuit/gitlocalize-11567 
Translated resources to Ukrainian
 2020-05-04 21:21:37 +02:00
TheBusyBiscuit
d1a095800e
[CI skip] Merge pull request #1860 from TheBusyBiscuit/gitlocalize-11568 
Added Ukrainian messages
 2020-05-04 21:21:26 +02:00
TheBusyBiscuit
e95c5939a3 [CI skip] Added Ukrainian language 2020-05-04 21:21:01 +02:00
bito-blosh
1fb1a149db Translate messages_ja.yml via GitLocalize 2020-05-04 18:38:46 +00:00
TheBusyBiscuit
d74c2cff8b Translate messages_ja.yml via GitLocalize 2020-05-04 18:38:45 +00:00
SoSeDiK
b4fd2510cb Translate recipes_uk.yml via GitLocalize 2020-05-04 16:14:12 +00:00
SoSeDiK
3104504628 Translate recipes_ru.yml via GitLocalize 2020-05-04 15:58:28 +00:00
SoSeDiK
09a7578e10 Translate researches_ru.yml via GitLocalize 2020-05-04 15:44:24 +00:00
SoSeDiK
6428e84b17 Translate researches_uk.yml via GitLocalize 2020-05-04 15:43:28 +00:00
Turret
665779c30b Translate researches_sv.yml via GitLocalize 2020-05-04 15:29:36 +00:00
TheBusyBiscuit
beb03ce8e8
[CI skip] Merge pull request #1858 from TheBusyBiscuit/gitlocalize-11566 
Translation 5
 2020-05-04 17:08:53 +02:00
SoSeDiK
27e3afe9bd Translate categories_uk.yml via GitLocalize 2020-05-04 15:06:37 +00:00
SoSeDiK
cc36ae9d3a Translate messages_uk.yml via GitLocalize 2020-05-04 15:06:32 +00:00
SoSeDiK
20af50f800 Translate resources_uk.yml via GitLocalize 2020-05-04 15:06:27 +00:00
Turret
3dbd7b03ac Translate messages_sv.yml via GitLocalize 2020-05-04 15:02:12 +00:00
SoSeDiK
87146acdfc Translate messages_ru.yml via GitLocalize 2020-05-04 15:00:37 +00:00
TheBusyBiscuit
18c78a7df2 Translate messages_de.yml via GitLocalize 2020-05-04 14:39:28 +00:00
TheBusyBiscuit
d70dace96f
[CI skip] Merge pull request #1848 from TheBusyBiscuit/gitlocalize-11553 
Added korean categories
 2020-05-04 16:37:42 +02:00
TheBusyBiscuit
14f06aac02
[CI skip] Merge pull request #1847 from TheBusyBiscuit/gitlocalize-11552 
Added korean geo resources
 2020-05-04 16:37:28 +02:00
TheBusyBiscuit
113377ceb1 [CI skip] Added 4 new languages 2020-05-04 16:36:07 +02:00
TheBusyBiscuit
0e58c3fa35 Added first Unit Tests 2020-05-04 16:25:47 +02:00
TheBusyBiscuit
3e2d1847ed Little performance improvement 2020-05-03 18:36:29 +02:00
TheBusyBiscuit
cc62bc15f7 [CI skip] Removed duplicate config value 2020-05-02 19:42:52 +02:00
kwonms871
c286f0652e Translate categories_ko.yml via GitLocalize 2020-05-02 17:42:36 +00:00
AOJUCBJD
de388695b7 Translate resources_ko.yml via GitLocalize 2020-05-02 17:33:27 +00:00
kwonms871
3db2154fc9 Translate resources_ko.yml via GitLocalize 2020-05-02 17:33:25 +00:00
András Marczinkó
58d29b427b Translate messages_hu.yml via GitLocalize 2020-05-02 17:28:08 +00:00
TheBusyBiscuit
4131a900e1
Merge pull request #1844 from clementgallois/master 
Resolves #1843
 2020-05-02 19:13:00 +02:00
TheBusyBiscuit
0c123631d9 [CI skip] Fixed one assignment 2020-05-02 19:10:48 +02:00
TheBusyBiscuit
c6ad95bace
[CI skip] Merge pull request #1673 from TheBusyBiscuit/gitlocalize-11195 
Added hebrew categories
 2020-05-02 19:10:18 +02:00
TheBusyBiscuit
981c6ab8e8
[CI skip] Merge pull request #1683 from TheBusyBiscuit/gitlocalize-11221 
Added indonesian categories
 2020-05-02 19:10:03 +02:00
TheBusyBiscuit
0e21ba6b02
[CI skip] Merge pull request #1758 from TheBusyBiscuit/gitlocalize-11274 
Added thai categories
 2020-05-02 19:09:54 +02:00
TheBusyBiscuit
2c409d1c27
[CI skip] Merge pull request #1766 from TheBusyBiscuit/gitlocalize-11284 
Added thai researches
 2020-05-02 19:09:44 +02:00
TheBusyBiscuit
343c2dbaf9 [CI skip] Added more translators to the credits 2020-05-02 19:09:28 +02:00
TheBusyBiscuit
b9f22fbe2a [CI skip] Minor changes 2020-05-02 19:07:31 +02:00
TheBusyBiscuit
e69cdff244 [CI skip] Added failsafe for misconfigured addons 2020-05-02 10:40:53 +02:00
clement.gallois@epitech.eu
6cb196898f Fixed typo 2020-05-02 00:18:59 +02:00
clement.gallois@epitech.eu
6ce560bdfe Resolves #1843 2020-05-02 00:01:01 +02:00
TheBusyBiscuit
085d10be0a Maybe resolves #1834 2020-05-01 11:25:42 +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
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
Sfiguz7
c7f846640d Translate recipes_it.yml via GitLocalize 2020-04-30 15:26:26 +00:00
Sfiguz7
2922422d88 Translate categories_it.yml via GitLocalize 2020-04-30 15:20:44 +00: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
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
15b64fc1d5
Revert "Easier to register items" 2020-04-25 23:13:00 +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
TheBusyBiscuit
45ed89c6f5 Bugged Generators from Addons will no longer destroy Energy Regulators 2020-04-25 02:16:21 +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
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
DNx5
70b5a5a9d1 code cleanup 2020-04-20 15:49:17 +07:00
DNx5
0784077821 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 
 Conflicts:
	src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/cargo/CargoNet.java
	src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/cargo/CargoUtils.java
 2020-04-20 15:32:45 +07:00
TheBusyBiscuit
d5eb1eddae [CI skip] Fixed javadocs 2020-04-19 13:23:20 +02:00
TheBusyBiscuit
61b4a1fe1a /sf teleporter will now open your own teleporter if no player was given 2020-04-19 13:18:33 +02:00
TheBusyBiscuit
16e2376604 Fixes #893 2020-04-19 13:06:58 +02:00
TheBusyBiscuit
a6a061588c Performance optimizations for large addons like ColoredEnderChests 2020-04-18 18:28:20 +02:00
TheBusyBiscuit
cbf7251dcd Added a few more Item Settings 2020-04-18 00:11:57 +02:00
TheBusyBiscuit
1957bee667 Refactored Talismans 2020-04-17 22:33:13 +02:00
TheBusyBiscuit
79867d79cf [CI skip] Some refactoring 2020-04-17 22:01:09 +02:00
TheBusyBiscuit
c007611cae Geo Scans are now paginated 2020-04-17 22:00:35 +02:00
TheBusyBiscuit
8c0c2e6c95 The Composter now also supports the Output Chest 2020-04-17 22:00:07 +02:00
Panda.com
5cf0d6d061 changed requested changes 2020-04-17 19:11:13 +02:00
Panda.com
fbdf934045 Change Automated ignition chambers recipe 2020-04-17 19:04:13 +02:00
TheBusyBiscuit
eead20cb7e Fixes #1814 2020-04-17 14:59:49 +02:00
TheBusyBiscuit
1dd8cd20d9 [CI skip] Refactoring 2020-04-17 14:14:24 +02:00
TheBusyBiscuit
a7c3ca1ab1
Merge pull request #1812 from Liruxo/master 
Changed Inventory opening behaviour
 2020-04-17 12:00:00 +02:00
TheBusyBiscuit
882d28cabe Fixed #1813 2020-04-17 11:59:40 +02:00
Liruxo
1cf461f986
Changed Inventory opening behaviour 2020-04-16 12:00:48 +02:00
TheBusyBiscuit
f5022ca790 [CI skip] Refactoring and deprecation 2020-04-15 17:52:15 +02:00
TheBusyBiscuit
76b8204bd0 [CI skip] You can no longer /sf give yourself a Multiblock 2020-04-14 23:50:12 +02:00
TheBusyBiscuit
5115175d7f Fixes #1807 2020-04-13 20:08:05 +02:00
TheBusyBiscuit
6dd02aaf6a Fixes #1806 2020-04-13 17:40:09 +02:00
DNx
f505d6f740 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 
 Conflicts:
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/OreCrusher.java
 2020-04-13 20:22:15 +07:00
DNx
e985698f9f Implement cargo network tick delay 2020-04-13 20:19:41 +07:00
TheBusyBiscuit
5842598f8e Fixes #1803 2020-04-12 23:25:52 +02:00
TheBusyBiscuit
2ebd003f3a Finalized new and improved Item Settings API 2020-04-12 12:57:35 +02:00
TheBusyBiscuit
15ed598552 [CI skip] Various fixes and documentation [javadocs] 2020-04-12 12:15:05 +02:00
TheBusyBiscuit
0c96323de9
[CI skip] Merge pull request #1800 from TweepCoding/master 
AncientAltarOutputEvent added
 2020-04-12 00:31:05 +02:00
TweepCoding
666c9a2a31 Adding Fixes Part... you get the point 2020-04-11 17:29:31 -05:00
TweepCoding
79737886ac Adding Fixes Part 3: I dont know what to put here 2020-04-11 17:23:07 -05:00
TweepCoding
fb9e0f1ab8 Adding Fixes Part 2: Electric Bungaloo 2020-04-11 11:37:57 -05:00
TweepCoding
7a798b0bc8 Adding Fixes 2020-04-11 09:08:36 -05:00
TheBusyBiscuit
46ff8b076d [CI skip] Removed Java 1.9 only stuff... 2020-04-11 15:07:24 +02:00
TheBusyBiscuit
8cb99fd7ae [CI skip] More refactoring, more documentation [javadocs] 2020-04-11 14:38:28 +02:00
TweepCoding
332a017c63 Adding Extra Method 2020-04-10 23:21:40 -05:00
TweepCoding
9c6c80da6c Adding Extra Method 2020-04-10 23:00:44 -05:00