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,078 Commits 1 Branch 0 Tags 64 MiB
6d569f0ead
Commit Graph

2355 Commits

Author SHA1 Message Date
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
SlimeyDerp
b7929dfebf Adding Altar Output Event 2020-04-10 22:49:30 -05:00
DNx
ec6698602c optimize Cargo Node's filter index saving. 2020-04-11 05:32:18 +07:00
DNx
ebd8974155 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-04-11 04:18:27 +07:00
TheBusyBiscuit
65116afbe7 [CI skip] Refactoring and documentation [javadocs] 2020-04-10 20:30:24 +02:00
DNx
2233a0314d added leftover changes, and bug fixes. 
with possibility of bringing more bugs
 2020-04-10 13:59:50 +07:00
DNx
e4a5e78cc6 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 
 Conflicts:
	pom.xml
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/OreCrusher.java
 2020-04-10 08:08:27 +07:00
DNx
c00fb1dc1b simplify cargo withdraw methods. 
trying to reduce unnecessary item clone as much as possible.
 2020-04-10 08:05:17 +07:00
DNx
88a5129b1a Move BlockUtils into cargo package. removed ender chest from the list. use slimefun's method to check minecraft version 2020-04-10 07:22:32 +07:00
DNx
4cc2e8c4d2 Fix OreCrusher, add recipes on post-register 2020-04-10 07:04:24 +07:00
DNx
75564fc7f1 fix OreCrusher item registration 2020-04-10 04:41:10 +07:00
DNx
fa8c07884c fix 1.13 compatibility 2020-04-10 04:40:38 +07:00
TheBusyBiscuit
e3d84de7b9 [CI skip] Refactoring 2020-04-09 22:16:32 +02:00
DNx
9eb3ee2d53 Simplify and optimize the Cargo insertion 2020-04-10 03:12:30 +07:00
DNx
aeab78b174 simplify the shulker boxes check 2020-04-10 02:20:54 +07:00
TheBusyBiscuit
f5bd880227 [Ci skip] Forgot to delete this class 2020-04-09 14:31:02 +02:00
TheBusyBiscuit
911f8aeceb [CI skip] More refactoring and overall API improvements 2020-04-09 14:22:30 +02:00
TheBusyBiscuit
8f698bebee [CI skip] Reduced technical debt 2020-04-09 03:18:14 +02:00
TheBusyBiscuit
0e6af8e0a1 [CI skip] A bunch of improvements [javadocs] 2020-04-09 02:21:30 +02:00
TheBusyBiscuit
d03cb64c02 Removed /sf elevator 2020-04-08 20:33:10 +02:00
TheBusyBiscuit
ab31180050 [CI skip] Added a new exception [javadocs] 2020-04-08 15:49:44 +02:00
TheBusyBiscuit
a77c9c3dad [CI skip] Forgot a character [javadocs] 2020-04-07 19:38:00 +02:00
TheBusyBiscuit
df06dde53e [CI skip] Some minor changes [javadocs] 2020-04-07 19:01:30 +02:00
TheBusyBiscuit
be50bc9128
[CI skip] Merge pull request #1795 from TheBusyBiscuit/gitlocalize-11370 
Turkish translation update Pt. 2: Researches
 2020-04-07 18:34:12 +02:00
LinoxGH
3c272fb76b Translate researches_tr.yml via GitLocalize 2020-04-07 15:41:43 +00:00
LinoxGH
b23555181f Translate recipes_tr.yml via GitLocalize 2020-04-07 15:41:00 +00:00
TheBusyBiscuit
afd978b2ad [CI skip] More refactoring [javadocs] 2020-04-07 01:01:13 +02:00
TheBusyBiscuit
82bd45a960 [CI skip] More work on the book 2020-04-05 20:54:28 +02:00
DNx
9461447410 split shulker boxes check 2020-04-05 23:30:19 +07:00
DNx
2396db25ad code cleanup 2020-04-05 23:25:10 +07:00
TheBusyBiscuit
8011956459 [CI skip] Added /sf search suggestion to the book interface 2020-04-05 18:02:45 +02:00
TheBusyBiscuit
af4de4fd10 [CI skip] WIP Refactoring 2020-04-05 17:35:50 +02:00
DNx
ab41129d6b Cargo - small performance improvements 2020-04-05 09:26:46 +07:00
DNx
e07c2f5263 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-04-05 09:12:07 +07:00
TheBusyBiscuit
f65563b28c [CI skip] More refactoring 2020-04-04 20:55:28 +02:00
TheBusyBiscuit
b96fd1d4dc [CI skip] Fixed javadocs [javadocs] 2020-04-04 15:20:34 +02:00
TheBusyBiscuit
007a4c6f83 [CI skip] More refactoring and documentation [javadocs] 2020-04-04 15:16:11 +02:00
DNx
6d9bd2ccf2 Cargo - small performance improvements 2020-04-04 12:20:56 +07:00
TheBusyBiscuit
f8765ea84e [CI skip] Building javadocs [javadocs] 2020-04-04 03:29:13 +02:00
TheBusyBiscuit
b3cc976ac3 Added ItemSetting API [javadocs] 2020-04-04 03:24:49 +02:00
TheBusyBiscuit
b01b980d2f Refactoring and more error contexts 2020-04-04 02:45:51 +02:00
TheBusyBiscuit
ab3c0eb945 [CI skip] Fixed javadocs [javadocs] 2020-04-03 12:17:30 +02:00
TheBusyBiscuit
f054d83130 [CI skip] Generate javadocs [javadocs] 2020-04-03 12:10:42 +02:00
TheBusyBiscuit
156683f318 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-04-03 11:42:12 +02:00
TheBusyBiscuit
44ab15811a Fixes #1779 and some other changes 2020-04-03 11:41:58 +02:00
András Marczinkó
56cfc8042e Translate recipes_hu.yml via GitLocalize 2020-03-31 15:42:21 +00:00