mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-21 12:15:50 +00:00
Code Releases Activity
4,028 Commits 1 Branch 0 Tags 64 MiB
72a3f59d4b
Commit Graph

1139 Commits

Author SHA1 Message Date
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
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
44ab15811a Fixes #1779 and some other changes 2020-04-03 11:41:58 +02:00
TheBusyBiscuit
7944c44c43 Fixed a small bug 2020-03-30 18:50:55 +02:00
TheBusyBiscuit
107483d64f [CI skip] Finally... [javadocs] 2020-03-30 18:47:24 +02:00
TheBusyBiscuit
ad6dfb676c [CI skip] Some API changes 2020-03-30 18:43:24 +02:00
TheBusyBiscuit
6d12b23fc1 [CI skip] Added remaining recipe translation keys 2020-03-30 13:58:36 +02:00
TheBusyBiscuit
d763a38308 [CI skip] Added Guide Options API 2020-03-29 18:57:43 +02:00
TheBusyBiscuit
a449b62dba [CI skip] Added an API for Guide Options 2020-03-29 18:54:46 +02:00
TheBusyBiscuit
03a42ab946 [CI skip] Fixed javadocs [javadocs] 2020-03-28 21:14:31 +01:00
TheBusyBiscuit
c5793405ee [CI skip] Rebuild javadocs [javadocs] 2020-03-28 21:04:16 +01:00
TheBusyBiscuit
ebe686d458 [CI skip] Prevent non-dependents from becoming addons 2020-03-28 21:02:36 +01:00
TheBusyBiscuit
04345735df [CI skip] Added new exception that prevents Addons from doing dumb stuff 2020-03-28 15:47:01 +01:00
TheBusyBiscuit
43cbdf25e9 [CI skip] Removed deprecated intefaces 2020-03-28 12:50:17 +01:00
TheBusyBiscuit
83685533f9 Filing a new release 2020-03-28 12:12:26 +01:00
TheBusyBiscuit
e6100a20df [Ci skip] Refactoring 2020-03-27 13:19:47 +01:00
TheBusyBiscuit
03d1bd709d [CI skip] Refactoring 2020-03-27 12:16:42 +01:00
TheBusyBiscuit
1cd84ff17a [Ci skip] Added a small failsafe 2020-03-27 08:39:27 +01:00
TheBusyBiscuit
de9039e6db [CI skip] Refactoring 2020-03-27 01:55:11 +01:00
TheBusyBiscuit
d78e8fa44c [CI skip] Include EmeraldEnchants integration now properly 2020-03-27 01:21:48 +01:00
TheBusyBiscuit
35f45df852 [CI skip] Moved Cargo network classes 2020-03-27 00:31:12 +01:00
TheBusyBiscuit
6553dfce6e Fixes #1768 2020-03-27 00:30:05 +01:00
TheBusyBiscuit
724810bb4a :dumb cookie facepalm emote: 2020-03-26 19:04:44 +01:00
TheBusyBiscuit
6cd3b1baea Quick fix 2020-03-26 19:03:45 +01:00
TheBusyBiscuit
f2c7964dc6 Refactored some things 2020-03-26 18:59:28 +01:00
TheBusyBiscuit
3e90349551 Refactored some things 2020-03-26 18:56:14 +01:00
Nicolas Saavedra gonzalez
52e6f39d77 Removed lore changes 2020-03-24 07:54:46 -05:00
Nicolas Saavedra gonzalez
49afe21f15 .DS_Store banished! 2020-03-24 00:32:03 -05:00
Nicolas Saavedra gonzalez
19dd69ffdc Upload 2020-03-24 00:08:55 -05:00
TheBusyBiscuit
f8d17472f2 [CI skip] Very small improvements to cargo networks 2020-03-24 02:00:21 +01:00
TheBusyBiscuit
7458aa5bb8 [CI skip] Refactoring and updated documentation [javadocs] 2020-03-23 16:52:51 +01:00
TheBusyBiscuit
2c290c9601 [CI skip] A little refactoring 2020-03-23 04:21:06 +01:00
TheBusyBiscuit
6d40852afc [CI skip] Refactoring and documentation [javadocs] 2020-03-22 16:45:57 +01:00
TheBusyBiscuit
0babf64d62 [CI skip] Refactoring and documentation [javadocs] 2020-03-22 16:44:28 +01:00
TheBusyBiscuit
2a0c3ff93c [CI skip] Added some package documentations [javadocs] 2020-03-21 21:17:21 +01:00
TheBusyBiscuit
dd29abf24a [CI skip] Added package docs [javadocs] 2020-03-21 21:16:25 +01:00
TheBusyBiscuit
9ac325adbc [CI skip] Updated translators 2020-03-21 20:55:42 +01:00
TheBusyBiscuit
2f70eaf8d4 [CI skip] Fixed javadocs annotations 2020-03-21 17:40:35 +01:00
TheBusyBiscuit
bfcbda1030
Merge pull request #1722 from StarWishsama/patch-3 
Fixed #1721
 2020-03-20 11:37:54 +01:00
TheBusyBiscuit
777b54e696 Fixed Android Fuel Interfaces 2020-03-20 11:37:37 +01:00
Nameless
847c545d07
Fixed #1721 2020-03-20 15:12:26 +08:00
TheBusyBiscuit
84dbea4473 Improved Slimefun Guide History, it now remembers category pages 2020-03-19 20:38:13 +01:00
TheBusyBiscuit
afac5cc0ce Fixes #1719 2020-03-19 13:14:29 +01:00
TheBusyBiscuit
4744fbac56 [CI skip] Refactoring 2020-03-18 15:52:36 +01:00
TheBusyBiscuit
3cd31e2c2f Some minor improvements 2020-03-18 14:20:49 +01:00
TheBusyBiscuit
2de6c9d249 Fixed #1711 2020-03-17 16:46:08 +01:00
TheBusyBiscuit
bd09ea0d9d Fixed #1710 2020-03-17 16:45:13 +01:00
TheBusyBiscuit
32a922ec7f Fixes #1706 2020-03-17 00:43:57 +01:00
TheBusyBiscuit
c45fe146f6 Firework from researching no longer deals damage 2020-03-16 19:06:51 +01:00
TheBusyBiscuit
0c5ef6fc83 Added Makeshift Smeltery + Tree Growth Accelerator 2020-03-16 02:18:35 +01:00
TheBusyBiscuit
fef2a4ae2d Added Makeshift Smeltery 2020-03-16 01:57:37 +01:00
TheBusyBiscuit
3c70941514 Added RecipeChoiceTask to Multiblocks 2020-03-16 01:57:20 +01:00
TheBusyBiscuit
58ad9e3749 Updated bStats charts 2020-03-15 17:52:12 +01:00
TheBusyBiscuit
ca26368847 [CI skip] Refactoring 2020-03-15 17:43:51 +01:00
TheBusyBiscuit
5c1e949c2a [CI skip] Reduced technical debt 2020-03-15 15:12:44 +01:00
TheBusyBiscuit
8502c42128 Fixed #1397 2020-03-15 13:41:44 +01:00
TheBusyBiscuit
46003a1026 Fixed #1648 2020-03-15 13:16:49 +01:00
TheBusyBiscuit
2e3a7f3a9b [CI skip] Refactoring 2020-03-15 13:16:24 +01:00
TheBusyBiscuit
4bcccd3872 Fixes #1686 2020-03-14 01:12:52 +01:00
TheBusyBiscuit
be836145ea [CI skip] Little change 2020-03-13 16:00:35 +01:00
TheBusyBiscuit
f0e29fc767 [CI skip] Refactoring, also updated README 2020-03-13 01:52:57 +01:00
TheBusyBiscuit
e893e179ea Fixes #1570 2020-03-12 03:32:28 +01:00
TheBusyBiscuit
6ccba72668 [CI skip] Refactoring 2020-03-12 03:32:04 +01:00
Daniel Walsh
4c1953ef60
Link SlimefunItemStack 2020-03-11 02:13:58 +00:00
Daniel Walsh
865ff25d4c
(By the way, you know this breaks convention) 2020-03-11 02:10:57 +00:00
Daniel Walsh
c1aa385fae
Import 2020-03-11 02:06:22 +00:00
Daniel Walsh
1eeeaba3a4
Add getItem() 2020-03-11 01:53:59 +00:00
TheBusyBiscuit
d68c019396 [Ci skip] Little tweak 2020-03-10 22:28:17 +01:00
TheBusyBiscuit
952d2592b7 [CI skip] Updated language files 2020-03-10 22:09:19 +01:00
TheBusyBiscuit
eb6140c7ed [CI skip] Added new recipe type translations 2020-03-10 21:44:42 +01:00
TheBusyBiscuit
242aba9352 [CI skip] Refactoring 2020-03-10 21:44:24 +01:00
TheBusyBiscuit
e486ab152b [CI skip] Refactoring 2020-03-10 15:20:59 +01:00
TheBusyBiscuit
aa1f505141 [CI skip] Refactoring 2020-03-10 01:49:55 +01:00
TheBusyBiscuit
e4b00920d2 [CI skip] Reduced technical debt 2020-03-08 18:27:32 +01:00
TheBusyBiscuit
7f12521b00 Significantly increased the teleporter speed 2020-03-08 17:43:56 +01:00
TheBusyBiscuit
3ea6d0d16b [CI skip] Updated translators list 2020-03-07 17:26:16 +01:00
TheBusyBiscuit
96179d9d36 [CI skip] Refactoring, documentation, reduced technical debt 2020-03-07 14:52:33 +01:00
TheBusyBiscuit
1c8a7e4958 Fixed Solar Generators not working 2020-03-07 11:35:29 +01:00
TheBusyBiscuit
f499f840c3 Changed Ignition Chamber to a Dropper 2020-03-07 00:10:52 +01:00
TheBusyBiscuit
0228b76f0b Cleaned up some old stuff and added new bStats charts 2020-03-06 16:39:07 +01:00
TheBusyBiscuit
0a3f910892 Back to the development branch 2020-03-06 11:48:39 +01:00
TheBusyBiscuit
82c6bb9b6d Pushing another build 2020-03-06 11:42:33 +01:00
TheBusyBiscuit
a7f1879df4 [CI skip] Little bit more refactoring before another release candidate 2020-03-06 11:37:55 +01:00
Nameless
882a4aa728
Fixed #1613 2020-03-06 09:54:07 +08:00
TheBusyBiscuit
4255aaa444 [CI skip] Refactoring + documentation 2020-03-06 01:57:50 +01:00
TheBusyBiscuit
42e13e6194 [CI skip] Updated documentation 2020-03-06 01:22:54 +01:00
TheBusyBiscuit
58b2ac0dfc [CI skip] More refactoring, reduced technical debt 2020-03-05 23:38:39 +01:00
TheBusyBiscuit
1544443ad1 [CI skip] Updated javadocs 2020-03-05 21:52:34 +01:00
TheBusyBiscuit
22776e828d [CI skip] Refactoring + Added Javadocs 2020-03-05 21:28:50 +01:00
TheBusyBiscuit
0ab4ba425c [CI skip] One more class 2020-03-05 01:02:03 +01:00
TheBusyBiscuit
f08521e7b9 [CI skip] And even more refactoring and documentation 2020-03-05 01:01:38 +01:00
TheBusyBiscuit
0369fac3d6 [CI skip] More refactoring and documentation 2020-03-05 00:52:14 +01:00
TheBusyBiscuit
c7040fee49 [CI skip] Refactoring + documentation. A lot of it. 2020-03-05 00:04:18 +01:00
TheBusyBiscuit
f0f2f0be92 [CI skip] Refactoring and documentation 2020-03-02 14:25:33 +01:00
TheBusyBiscuit
25eca28be3 [CI skip] Added new RC tags to the GitHub Releases tab 2020-03-02 12:46:28 +01:00
TheBusyBiscuit
e9ca9aac66 [CI skip] Weird fix but ok 2020-03-01 19:55:56 +01:00
TheBusyBiscuit
5d677f59da [CI skip] Little change 2020-03-01 19:40:34 +01:00
TheBusyBiscuit
b6e574fc1d [CI skip] More refactoring 2020-03-01 16:17:18 +01:00
Panda.com
7b74a347b6 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 into fix/performance-improvements 
# Conflicts:
#	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/GearListener.java
 2020-03-01 15:52:36 +01:00
TheBusyBiscuit
9eda7d1e5e [CI skip] Refactoring 2020-03-01 15:23:09 +01:00
TheBusyBiscuit
c3f6eb3a3d [CI skip] More refactoring 2020-03-01 15:06:35 +01:00
Panda.com
56648c464f last fix! 2020-03-01 14:59:11 +01:00
TheBusyBiscuit
aaff35152a [CI skip] Refactored Slimefun guide 2020-03-01 14:49:00 +01:00
Panda.com
efa8d81f77 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 into fix/performance-improvements 
# Conflicts:
#	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/TalismanListener.java
 2020-03-01 14:33:44 +01:00
Panda.com
105b32583d Changed requested changes 2020-03-01 14:27:11 +01:00
TheBusyBiscuit
0609fa1b5f [CI skip] Added a warning for disabled auto-updaters. 2020-03-01 14:03:12 +01:00
TheBusyBiscuit
f007c1b68e [CI skip] Reduced technical debt 2020-03-01 10:36:31 +01:00
TheBusyBiscuit
dad60f85c4 Fixes #1577 2020-03-01 09:29:37 +01:00
TheBusyBiscuit
b2a0214ef0 [CI skip] More cleanup 2020-03-01 01:05:48 +01:00
TheBusyBiscuit
cec1107198 [CI skip] A bunch of refactoring 2020-02-29 23:42:02 +01:00
Daniel Walsh
cbd7faf4d7 General performance improvements 2020-02-27 16:11:32 +00:00
ThatPreston
5549eb77b7
Remove Rainbow Concrete Powder 2020-02-26 15:23:06 -06:00
ThatPreston
0414cae04a
Remove Rainbow Concrete Powder 2020-02-26 15:21:45 -06:00
ThatPreston
2197b7eabd
Update ResearchSetup.java 2020-02-26 15:20:04 -06:00
ThatPreston
1e9dc2b85d
Added New Rainbow Blocks 
Added rainbow concrete, concrete powder, and glazed terracotta to the rainbow blocks research group.
 2020-02-25 18:38:45 -06:00
ThatPreston
d12f7b4b8e
Added New Rainbow Blocks 
Added normal and seasonal variants of rainbow concrete, concrete powder, and glazed terracotta.
 2020-02-25 18:36:53 -06:00
ThatPreston
4c8bb36c6a
Added New Seasonal Rainbow Blocks 
Added Christmas, Halloween, and Valentine's Day variants of rainbow concrete, concrete powder, and glazed terracotta.
 2020-02-25 18:15:14 -06:00
ThatPreston
ab1c9318a6
Add new Rainbow Blocks 
Added Rainbow Concrete, Rainbow Concrete Powder, and Rainbow Glazed Terracotta
 2020-02-25 17:53:28 -06:00
TheBusyBiscuit
15e57ffd9c Pushing another build again 2020-02-24 00:53:13 +01:00
TheBusyBiscuit
2869a654c9 [CI skip] More Refactoring 2020-02-23 00:59:55 +01:00
TheBusyBiscuit
dcd7146949 [CI skip] Some minor changes 2020-02-22 18:54:23 +01:00
TheBusyBiscuit
51d33dee02 [CI skip] Recipe Types can now be translated as well 2020-02-22 15:41:35 +01:00
Nameless
0c3884ca91
Fix #1558 2020-02-22 18:55:09 +08:00
TheBusyBiscuit
9ca20379a2 [Ci skip] Some more refactoring 2020-02-21 22:13:38 +01:00
TheBusyBiscuit
6175cff35a A Refactoring Supernova - You don't wanna look at the Diff 2020-02-21 21:22:26 +01:00
TheBusyBiscuit
f9f3e495e7 [CI skip] Refactoring 2020-02-21 12:09:12 +01:00
TheBusyBiscuit
155a9572c4 Fixed #1557 2020-02-21 11:00:41 +01:00
Nameless
078b506aca
Try to fix #1513 2020-02-20 11:15:06 +08:00
ThatPreston
c0af5eee77
Update SlimefunManager.java 2020-02-19 13:51:05 -06:00
TheBusyBiscuit
682755f106 Switching back to the development branch 2020-02-16 12:22:59 +01:00
TheBusyBiscuit
3226f57e8d Pushing another stable build 2020-02-16 12:21:25 +01:00
TheBusyBiscuit
5e74657263 [CI skip] Changed the API a bit 2020-02-16 12:17:14 +01:00
TheBusyBiscuit
9510d9b1fb [CI skip] Updated translators 2020-02-15 20:43:21 +01:00
TheBusyBiscuit
7d1e3b729e [CI skip] Updated change log 2020-02-14 10:49:45 +01:00
Nameless
b703f176a2
Fixed magician talisman can't give book extra enchantment 2020-02-14 11:16:41 +08:00
TheBusyBiscuit
e3a778ded1 [CI skip] Updated translators list 2020-02-14 01:57:41 +01:00
TheBusyBiscuit
ecfd242c32
Merge branch 'master' into patch-2 2020-02-13 01:46:02 +01:00
Nameless
d8c29ec7bb
Double ores by drop items 2020-02-13 08:40:18 +08:00
TheBusyBiscuit
0ff1311c32 [CI skip] Updated language files and reduced technical debt 2020-02-13 01:30:27 +01:00
Nameless
ef3c1f3d10
Update TalismanListener.java 2020-02-12 21:39:42 +08:00
Nameless
c25a39c955
Avoid can't get bonus items 2020-02-12 16:43:53 +08:00
Nameless
07b7ed73fa
Fixed give more items when using fortune pickaxe 2020-02-12 14:39:16 +08:00
Nameless
c899413f7f
Forgot to import packages 2020-02-12 14:14:08 +08:00
Nameless
b87354a39e
Fixed #1516 2020-02-12 14:07:42 +08:00
TheBusyBiscuit
55b01b61f1 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-02-11 22:22:43 +01:00
TheBusyBiscuit
2cf5989d7a More cleanup and Refactoring 2020-02-11 22:22:33 +01:00
TheBusyBiscuit
92ab904a41
Merge pull request #1514 from StarWishsama/patch-1 
Fixed can't back in setting opened by command
 2020-02-11 21:16:34 +01:00
TheBusyBiscuit
17cf48a773 [CI skip] Fixes #1515 2020-02-11 21:16:09 +01:00
Nameless
302a059bf8
Fixed can't back in setting opened by command 2020-02-11 15:51:10 +08:00
TheBusyBiscuit
e3a02ea52d [CI skip] Updated /sf research 2020-02-10 18:00:14 +01:00
TheBusyBiscuit
f5dd391566 [Ci skip] Reduced cognitive complexity 2020-02-10 13:52:38 +01:00
TheBusyBiscuit
b5a7b5f5b6 [CI skip] Removed a redundancy 2020-02-10 13:45:50 +01:00
TheBusyBiscuit
fbc1726e5d [CI skip] Added czech translators 2020-02-10 12:51:39 +01:00
TheBusyBiscuit
b916c3636b [CI skip] A lot of internal cleanup, performance improvements 2020-02-10 12:42:34 +01:00
TheBusyBiscuit
e53746990e [CI skip] Reduced technical debt 2020-02-09 23:13:15 +01:00
TheBusyBiscuit
3a5a18ae70 [CI skip] Moved some items to different categories 2020-02-09 13:42:21 +01:00
TheBusyBiscuit
e6c2cbf5fc Added unfinished languages back into the development branch 2020-02-09 12:19:35 +01:00
TheBusyBiscuit
04709365a4 Finishing touches, new stable release incoming 2020-02-09 12:04:06 +01:00
TheBusyBiscuit
e0e46995af [Ci skip] Little fix 2020-02-09 11:15:34 +01:00
Nameless
6e34f86797 Give filled knowledge flask as SlimefunItem 2020-02-09 18:10:45 +08:00
TheBusyBiscuit
9bdd961332 [CI skip] Updated bStats and CS-CoreLib2 2020-02-09 11:03:46 +01:00
TheBusyBiscuit
cefa85f451 [CI skip] Removed deprecated method 2020-02-09 00:30:31 +01:00
TheBusyBiscuit
be43f825a9 [Ci skip] Refactored Androids 2020-02-09 00:26:04 +01:00
TheBusyBiscuit
8b3b67e5c5 [CI skip] Removed deprecated method 2020-02-08 23:02:25 +01:00
TheBusyBiscuit
8b3aa8ffbe [Ci skip] Refactoring 2020-02-08 22:58:55 +01:00
TheBusyBiscuit
55cf5a1079 [Ci skip] Improved debugging and removed a deprecated class 2020-02-08 22:42:11 +01:00
TheBusyBiscuit
447683b600 [CI skip] Refactoring 2020-02-08 20:50:21 +01:00
NihilistBrew
5674570175 small formatting 2020-02-08 13:58:01 +01:00
Poma123
4f6ca04843
Merge pull request #2 from TheBusyBiscuit/master 
Comparing new changes
 2020-02-08 10:05:53 +01:00
TheBusyBiscuit
38830b3bdf [Ci skip] Updated translators 2020-02-08 10:02:12 +01:00
poma123
9bb3fea54c Fix PickaxeOfContainmnet bug 2020-02-08 09:57:46 +01:00
TheBusyBiscuit
f68d110a43 [Ci skip] Minor design change 2020-02-08 02:55:49 +01:00
TheBusyBiscuit
5317c46b2f [CI skip] "a shit ton" may be an understatement 2020-02-08 02:36:57 +01:00
TheBusyBiscuit
ee695f8dee [Ci skip] Code improvements 2020-02-06 22:31:45 +01:00
TheBusyBiscuit
ccc1048eed [CI skip] A little bit refactoring 2020-02-06 20:38:32 +01:00
TheBusyBiscuit
df60d4c2fd [Ci skip] Updated translators 2020-02-06 19:20:37 +01:00
TheBusyBiscuit
c33054cffd [CI skip] Updated translators 2020-02-06 19:03:47 +01:00
TheBusyBiscuit
62e4712067 [CI skip] Updated languages 2020-02-05 23:34:17 +01:00
NihilistBrew
162a5e45f3
Update SlimefunItems.java 2020-02-05 16:13:22 +01:00
NihilistBrew
9a672b3fde
formatting 2020-02-05 15:43:13 +01:00
TheBusyBiscuit
916432c9ab [Ci skip] Added many more languages 2020-02-05 01:40:47 +01:00
TheBusyBiscuit
f0a3ccc43c [CI skip] Reduced technical debt, improved performance, refactoring 2020-02-04 19:05:49 +01:00
TheBusyBiscuit
81a7725396 [Ci skip] Updated translators 2020-02-04 10:41:39 +01:00
TheBusyBiscuit
c952ac6477 [Ci skip] Minor UI update 2020-02-04 00:53:30 +01:00
TheBusyBiscuit
c1d885548a Languages now show their progress 2020-02-04 00:43:43 +01:00
TheBusyBiscuit
a864ddb59e Added Chinese (Taiwan) 2020-02-04 00:25:54 +01:00
TheBusyBiscuit
a15b32c964 Added Chinese (Taiwan) 2020-02-04 00:23:01 +01:00
TheBusyBiscuit
cc8bb1bebb [Ci skip] Added SlimefunBranch enum 2020-02-03 23:09:32 +01:00
TheBusyBiscuit
2ab549f7a4 [Ci skip] Some small fixes 2020-02-03 22:52:19 +01:00
TheBusyBiscuit
6f7f6c6323 Fixes #1438 2020-02-02 23:07:02 +01:00
TheBusyBiscuit
0bb8a11cd9 Fixes #1435 2020-02-02 20:20:57 +01:00
TheBusyBiscuit
7057e7fa53
Merge pull request #1433 from WalshyDev/patch-2 
Sync up cache stuff in BlockStorage
 2020-02-02 18:28:26 +01:00
TheBusyBiscuit
53345d0f8e Some refactoring + language updates 2020-02-02 18:27:32 +01:00
Daniel Walsh
99e8f5265a
Sync up cache stuff in BlockStorage 2020-02-02 16:01:47 +00:00
TheBusyBiscuit
f870eea2a7 [Ci skip] Updated translators 2020-02-02 17:01:12 +01:00
TheBusyBiscuit
548ec3fd6a [Ci skip] little fix 2020-02-02 16:37:59 +01:00
TheBusyBiscuit
519d59e9c8 [CI skip] Added "unsupported language" to bStats Metrics 2020-02-02 16:22:41 +01:00
TheBusyBiscuit
21fe6b691a [Ci skip] Researches can now be translated 2020-02-02 16:11:18 +01:00
TheBusyBiscuit
b01ae9ba69 [CI skip] Added more translators 2020-02-02 15:43:41 +01:00
TheBusyBiscuit
0b8d78c1f5 [Ci skip] Added russian translators 2020-02-01 23:07:21 +01:00
TheBusyBiscuit
a7c1b3a72f [Ci skip] Added StarWishsamas skin 2020-02-01 12:00:12 +01:00
TheBusyBiscuit
4fd6647cfd [Ci skip] Prepare Vietnamese 2020-02-01 11:08:35 +01:00
TheBusyBiscuit
4a5eea2f03 [Ci skip] Updated translators 2020-02-01 10:55:46 +01:00
TheBusyBiscuit
ea3c95c92c Added 5 new languages; removed some old code 2020-02-01 09:57:38 +01:00
TheBusyBiscuit
37d9f021cf [Ci skip] Unlocked 5 more languages 2020-02-01 09:46:08 +01:00
TheBusyBiscuit
6fa0850fc2 [ci skip] little change 2020-02-01 01:41:54 +01:00
TheBusyBiscuit
ea26ac49b1 Ree... Reeeee... Reeeeeeeee... REFACTORING 
(let's hope I didn't break anything)
 2020-02-01 01:32:38 +01:00
TheBusyBiscuit
73d17fd3d9 Little fix 2020-01-31 21:26:20 +01:00
TheBusyBiscuit
1b1a04cb1c Fixed swedish translation of "swedish" :kappa: 2020-01-31 21:24:04 +01:00
TheBusyBiscuit
dada3e37a0 Added Italian, Spanish, Swedish, Hungarian, Latvian and Slovak 2020-01-31 19:54:50 +01:00
TheBusyBiscuit
c8553a161b [Ci skip] Added a new translator 2020-01-31 11:14:50 +01:00
TheBusyBiscuit
1818da5cce [Ci skip] Forgot one thing 2020-01-31 09:53:13 +01:00
TheBusyBiscuit
f0f3740a2c [CI skip] Minor refactoring 2020-01-31 09:47:04 +01:00
TheBusyBiscuit
4cca09f6c9 [CI skip] Added a few more flags 2020-01-31 09:18:14 +01:00
TheBusyBiscuit
1db1168c09 [CI skip] Added more future language names 2020-01-31 00:59:36 +01:00
TheBusyBiscuit
704d3f47fa Fixed Minecraft recipes not showing correctly 2020-01-31 00:33:05 +01:00
TheBusyBiscuit
59abc2f2e2 Added french translation 2020-01-31 00:25:01 +01:00
TheBusyBiscuit
268f39cccd [Ci skip] Preparing for the french... 2020-01-31 00:18:19 +01:00
TheBusyBiscuit
6b7435a181 [CI skip] Added french translators 2020-01-31 00:09:57 +01:00
TheBusyBiscuit
3bdaf04c88 Fixed wrong file encodings 2020-01-30 23:48:40 +01:00
TheBusyBiscuit
aa3007ef0a [Ci skip] Little preparation 2020-01-30 23:19:42 +01:00
TheBusyBiscuit
761d52a9c6 Slimefun can now be translated (see wiki) 2020-01-30 22:03:17 +01:00
TheBusyBiscuit
6dc0907728 [CI skip] Reduced technical debt 2020-01-29 02:25:25 +01:00
TheBusyBiscuit
b94e197f06 Fixes #1396 2020-01-28 23:42:05 +01:00
TheBusyBiscuit
2133f528a9 Possibly fixes #1313 + Performance Improvements 2020-01-28 23:36:28 +01:00
TheBusyBiscuit
1f672905d2 Fixes #1394 2020-01-28 21:05:45 +01:00
TheBusyBiscuit
4882c7e4cc Super extreme ultra mega refactor 3000 2020-01-27 01:05:28 +01:00
TheBusyBiscuit
9f07d6b8c1 Fixes #1385 2020-01-26 11:05:37 +01:00
TheBusyBiscuit
06558541f3 Added #1387 to CHANGELOG.md 2020-01-26 03:15:10 +01:00
TheBusyBiscuit
20af3fc8ed
[CI skip] Merge pull request #1387 from BigBadE/master 
Added support for furnaces and brewing stands to cargo nets.
 2020-01-26 03:08:23 +01:00
bigbade
83b97384b7 Fixed bad return 2020-01-25 20:04:01 -08:00
bigbade
f5e6a4fcad Removed random import 2020-01-25 19:04:00 -08:00
bigbade
38b2bab35b Removed debug statement 2020-01-25 18:44:31 -08:00
bigbade
9c8d65d654 Added support for furnaces and brewing stands to cargo nets. 2020-01-25 18:40:01 -08:00
TheBusyBiscuit
44e3fad238 [CI skip] Removed some old code 2020-01-25 19:09:49 +01:00
bigbade
669a999d01 Added comments, switched return for MagicSugar, and made MagicSugar ancient altar check pass on any dispensers/enchantment tables. 2020-01-25 09:09:58 -08:00
TheBusyBiscuit
47b0ae5d9b Finalized Merging of Pull Request #1382 2020-01-25 17:16:16 +01:00
TheBusyBiscuit
4c58e61fcc
[CI skip] Merge pull request #1382 from BigBadE/master 
Small bug fixing
 2020-01-25 17:11:22 +01:00
TheBusyBiscuit
53be0a1842 Fixed Network Particles and added a max-nodes config option 2020-01-25 14:20:58 +01:00
TheBusyBiscuit
81b80643d3 [Ci skip] Refactoring 2020-01-25 13:36:36 +01:00
TheBusyBiscuit
2d9df90b1b [Ci skip] Minor refactoring 2020-01-25 13:11:04 +01:00
bigbade
71d4b74d72 Null checking is a good idea. 2020-01-24 19:58:10 -08:00
bigbade
4145eeb82d Fixed formatting 2020-01-24 19:43:56 -08:00
bigbade
e49f7de412 Allowed MagicSugar to be placed on Altars. 2020-01-24 19:42:15 -08:00
bigbade
e2ff5b2b09 Fixed DebugFishListener casting BlockData of wall skulls to Rotatable instead of Directional. 2020-01-24 19:07:41 -08:00
TheBusyBiscuit
623e5a2f02 [CI skip] Refactored default-languages 2020-01-21 14:37:19 +01:00
NihilistBrew
27086b4775
Change typo 2020-01-19 15:13:20 +01:00
NihilistBrew
fbf8907181
Additional formatting 2020-01-19 12:19:13 +01:00
NihilistBrew
27b8f53db9
Normalize formatting of SlimefunSetup.java 2020-01-18 09:45:48 +01:00
TheBusyBiscuit
73b64e874e Added more message strings, Elevators now support multiple pages 2020-01-14 20:48:04 +01:00
TheBusyBiscuit
6b53679715 Added support for multiple pages to the Elevator 2020-01-14 02:10:20 +01:00
TheBusyBiscuit
53efbf9612 [CI skip] Some more optimizations 2020-01-12 18:39:06 +01:00
TheBusyBiscuit
08f25c58a9 Performance improvements and some cleanup 2020-01-12 18:10:09 +01:00
TheBusyBiscuit
b6ca510094
[Ci skip] Merge pull request #1368 from J3fftw1/Feature/added-string 
added string to BioGenerator
 2020-01-12 16:04:42 +01:00
Panda.com
0aebfdef8a removed unused import 2020-01-12 15:36:01 +01:00
Panda.com
1ba2fd2f29 added prismarine to grindestone 2020-01-12 15:35:17 +01:00
Panda.com
eff7e9581f added string to BioGenerator 2020-01-12 15:21:33 +01:00
TheBusyBiscuit
8a267cad3e Fixes #1364 2020-01-12 13:14:41 +01:00
TheBusyBiscuit
51dfbaed8a Improved performance for GEO Miner and Oil Pump 2020-01-12 11:52:20 +01:00
TheBusyBiscuit
7c993ead57 [CI skip] Refactoring 2020-01-12 11:05:35 +01:00
TheBusyBiscuit
fe6caccee9 [CI skip] More refactoring 2020-01-12 11:01:29 +01:00
TheBusyBiscuit
b94121e55b Fixes #1366 2020-01-12 10:27:56 +01:00
TheBusyBiscuit
626a2ebdaf Refactoring, lots of refactoring 2020-01-12 02:05:33 +01:00
TheBusyBiscuit
1cbe3f9e1f A lot more refactoring and cleanup 2020-01-12 01:44:57 +01:00
TheBusyBiscuit
74f33764ad [CI skip] Added a "language" variable for PlaceholderAPI 2020-01-12 00:15:40 +01:00
TheBusyBiscuit
b715de5a5c [Ci skip] Reduced technical debt 2020-01-12 00:10:19 +01:00
TheBusyBiscuit
7bde982b8b [CI skip] More refactoring 2020-01-12 00:02:07 +01:00
TheBusyBiscuit
ffc0fe41f0 [CI skip] Refactoring 2020-01-11 23:58:05 +01:00
TheBusyBiscuit
55269d587c Added even more localization options 2020-01-11 23:03:35 +01:00
TheBusyBiscuit
d1a6f0c61c Added more stuff to the messages.yml 2020-01-11 22:07:14 +01:00
TheBusyBiscuit
67bf0f9f47 [CI skip] Thanks git... 2020-01-11 20:58:14 +01:00
TheBusyBiscuit
a50756ccb2 [CI skip] Refactoring + very small performance optimization for androids 2020-01-11 20:56:33 +01:00
TheBusyBiscuit
86ec4e17ac Fix indentation 2020-01-11 20:20:49 +01:00
TheBusyBiscuit
2e7df8acd2 Minor fix 2020-01-11 20:17:12 +01:00
TheBusyBiscuit
2dfb9ce92a Refined and refactored Localization code 2020-01-11 20:12:53 +01:00
TheBusyBiscuit
be0035f2f9 Build 400 - Players can now select their language 2020-01-10 22:40:36 +01:00
TheBusyBiscuit
8735a8e1a3 [Ci skip] Super secret feature 2020-01-10 21:43:49 +01:00
TheBusyBiscuit
13110a4927 Added gitlocalize 2020-01-10 16:25:10 +01:00
TheBusyBiscuit
6207b6348a Refactoring 2020-01-10 00:13:01 +01:00
TheBusyBiscuit
3fa4e1615e [CI skip] Minor refactoring 2020-01-09 23:43:30 +01:00
TheBusyBiscuit
c375384288 Removed Solar Array 2020-01-09 23:34:06 +01:00
TheBusyBiscuit
66b573e10e Fixes #1355 2020-01-09 23:33:11 +01:00
TheBusyBiscuit
abcd579323 Removed old and deprecated API (Addons should all have switched over...) 2020-01-06 22:48:14 +01:00
TheBusyBiscuit
ec409886a6 Another try... Pushing this to stable! 2020-01-06 20:04:39 +01:00
TheBusyBiscuit
cb73d37ed6 [CI skip] Added Fuffles_ to the contributors list. 2020-01-06 00:35:39 +01:00
TheBusyBiscuit
9033df4a16 Reworked Guide Settings (again) and reverted last change 2020-01-05 23:32:59 +01:00
TheBusyBiscuit
c05f604d4f Fixes #1354 2020-01-05 21:50:17 +01:00
TheBusyBiscuit
ff6f160138 Updated Ore Crusher Recipes 2020-01-05 21:49:21 +01:00
TheBusyBiscuit
9ff093affa Oil Pump now shows its "Bucket -> Oil" recipe. 2020-01-05 14:30:50 +01:00
TheBusyBiscuit
1f7e03a270 Possibly fixes #1346 and other concurrency issues 2020-01-04 16:51:25 +01:00
TheBusyBiscuit
e5fd1ad5b4 Fixed Iron Golems being repaired with slimefun ingots 2020-01-04 16:32:23 +01:00
TheBusyBiscuit
2409978b1d Fixes #1332 2020-01-04 16:29:15 +01:00
TheBusyBiscuit
23a51b898e A lot more refactoring + technical debt reduction + minor optimizations 2020-01-04 15:40:45 +01:00
TheBusyBiscuit
3c32ca6c60 Some cleanup 2020-01-04 13:55:33 +01:00
TheBusyBiscuit
6bae1098bc Fixes #1344 2020-01-03 16:59:11 +01:00
TheBusyBiscuit
69267983b9 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-01-03 16:36:09 +01:00
TheBusyBiscuit
95adc66536 Fixed two small issues and did some cleanup 2020-01-03 16:35:55 +01:00
TheBusyBiscuit
e0b240f570 Reduced technical debt 2020-01-03 16:33:58 +01:00
TheBusyBiscuit
5b86ef1e7e
Merge pull request #1339 from mohkamfer/AutomatedCraftingChamberCraftLast 
Enable Automated Crafting Chamber To Craft Last Shaped Recipe
 2020-01-03 14:42:57 +01:00
TheBusyBiscuit
89d55430fb Radioactive items have a new lore! 2020-01-03 14:41:15 +01:00
TheBusyBiscuit
1b0d507783 Updated Radioactive - lore. You may need to convert some items... 2020-01-03 13:57:56 +01:00
Muhammad Kamal
667ec595ee Refactor getSerializsedInput()'s if conditions 2020-01-03 14:52:34 +02:00
Muhammad Kamal
e8a79a7c3a Refactor tick()'s if condition 2020-01-03 14:50:02 +02:00
TheBusyBiscuit
34a56a1bb6 Simplified some lore utilities 2020-01-03 13:33:21 +01:00
Muhammad Kamal
fc007273bb Fix ItemStack Amounts Greater Than 1 2020-01-03 14:10:32 +02:00
Muhammad Kamal
9d246adf93 Reformat Code 2020-01-03 14:04:43 +02:00
TheBusyBiscuit
84604752e3 [CI skip] Little file size optimization I guess? 2020-01-03 02:20:36 +01:00
Muhammad Kamal
f8c2983491 Enable Automated Crafting Chamber To Craft Last Shaped Recipe 2020-01-01 00:02:47 +02:00
TheBusyBiscuit
3773460561 Fixes #1337 2019-12-30 01:25:05 +01:00
TheBusyBiscuit
e90b8c18f7 [CI skip] Reduced technical debt 2019-12-30 01:21:47 +01:00
TheBusyBiscuit
b74479327a [CI skip] Reduced technical debt 2019-12-30 01:18:09 +01:00
TheBusyBiscuit
1c0e36f6f1 [CI skip] Optimized and refactored some android code 2019-12-30 01:01:09 +01:00
TheBusyBiscuit
a817903a04 [CI skip] Updated dependencies 2019-12-29 22:13:00 +01:00
TheBusyBiscuit
b8a94e22e5 [CI skip] Some refactoring 2019-12-29 18:30:48 +01:00
TheBusyBiscuit
e2d58f7f50 Several changes, won't list em all 2019-12-29 14:14:51 +01:00
TheBusyBiscuit
8db990f56c [CI skip] Fixed pages for main menu 2019-12-29 00:05:30 +01:00
TheBusyBiscuit
39292ae9ce Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2019-12-28 12:43:01 +01:00
TheBusyBiscuit
784ad0b195 Fixes #1295 2019-12-28 12:42:39 +01:00
AlexLander123
586437b16d Fix Basic Circuit Board not dropping 2019-12-28 14:35:39 +08:00
TheBusyBiscuit
8b3d1fedcb [CI skip] Minor tweaks 2019-12-27 16:43:23 +01:00
TheBusyBiscuit
9a3d79781b [CI skip] Reduced technical debt 2019-12-27 11:38:54 +01:00
TheBusyBiscuit
687e97f8e9 Minecraft recipe will now scroll through all available items (e.g. wood) 2019-12-27 11:10:22 +01:00
TheBusyBiscuit
2a06c2e215 Slimefun Guide now shows ALL minecraft recipes, with pages 2019-12-27 02:16:01 +01:00
TheBusyBiscuit
5dc19aedc3 [CI skip] Excluded github-actions from the contributors list 2019-12-26 23:30:28 +01:00
TheBusyBiscuit
3a19350323 Added Kelp Cookies (because why not?) 2019-12-26 21:26:04 +01:00
TheBusyBiscuit
336b26759a [CI skip] Some minor changes 2019-12-26 21:10:03 +01:00
TheBusyBiscuit
f7bfff2f37 Players can now toggle their research-fireworks in the guide 2019-12-26 21:01:51 +01:00
TheBusyBiscuit
d2ac50be38 Overhauled Guide Settings 2019-12-26 20:52:15 +01:00
TheBusyBiscuit
b7776e73b4 Minor performance improvement 2019-12-26 20:29:20 +01:00
TheBusyBiscuit
4efb53b705 Minor changes 2019-12-26 20:22:28 +01:00
TheBusyBiscuit
5933bc6367 Reduced technical debt 2019-12-26 19:56:58 +01:00
TheBusyBiscuit
249af4001b Fixes #1325 2019-12-26 19:49:53 +01:00
TheBusyBiscuit
7183350e1a Some code cleanup 2019-12-26 18:36:21 +01:00
TheBusyBiscuit
0efc51c7ea Fixed Category constructor 2019-12-26 18:30:40 +01:00
TheBusyBiscuit
129b98dff6 Lots of refactoring, implemented a suggestion 2019-12-23 20:38:55 +01:00
TheBusyBiscuit
bd610a9f94 Fixes #1298 2019-12-23 19:39:35 +01:00
TheBusyBiscuit
0e0859e73a [CI skip] Another minecraft alias 2019-12-23 00:39:03 +01:00
TheBusyBiscuit
2edf5db140 [CI skip] Added bverhoevens and BurningBrimstones minecraft alias 2019-12-22 23:51:43 +01:00
TheBusyBiscuit
b5dd2f329a [CI skip] Reduced technical debt, lots of refactoring 2019-12-22 23:00:05 +01:00
TheBusyBiscuit
5a0b994a4f Fixes #1318 2019-12-22 14:03:52 +01:00
TheBusyBiscuit
997c682a00 Refactoring + Allowed custom models for UI elements 2019-12-22 14:00:35 +01:00
coco0325
2ceb9d6d45 Update OilPump.java 2019-12-22 17:08:44 +08:00
coco0325
4d63bffc72 Update OilPump.java 2019-12-22 15:31:53 +08:00
coco0325
87b8035b34 Corrected OliPump.java 2019-12-22 01:46:56 +08:00
coco0325
ff0016ad0e Update OilPump.java 2019-12-22 01:32:20 +08:00
coco0325
2fd2dae403 Revert "TW-1" 
This reverts commit 687516cfae.
 2019-12-22 01:18:12 +08:00
coco0325
7d0d222f79 Update OilPump.java 2019-12-22 01:16:43 +08:00
coco0325
060051623d Merge remote-tracking branch 'upstream/master' 2019-12-22 01:08:49 +08:00
coco0325
687516cfae TW-1 2019-12-22 01:07:58 +08:00
TheBusyBiscuit
bee2375757 Removed Nether Drill (+ some micro-optimizations) 2019-12-21 16:46:17 +01:00
TheBusyBiscuit
429c280095 Fixes #1316 2019-12-21 15:42:07 +01:00
TheBusyBiscuit
a89b9ff467 [CI skip] Fine, I'll do it myself, Thanos said 2019-12-19 23:26:40 +01:00
TheBusyBiscuit
97d72e0a8d
[CI skip] Merge pull request #1294 from BurningBrimstone/master 
Added recipes
 2019-12-19 23:25:03 +01:00
TheBusyBiscuit
f9b12dfed5 [CI skip] Improved Cargo Performance a lot (breaks Barrels though) 2019-12-19 23:22:09 +01:00
TheBusyBiscuit
f7fa6e2972 [CI skip] Reduced technical debt and tweaked Magnesium Salt 2019-12-18 01:07:04 +01:00
TheBusyBiscuit
331b9b64a7
[CI skip] Merge pull request #1310 from J3fftw1/feature/gravel-to-sand 
added a way to automate sand production
 2019-12-17 23:08:19 +01:00
J3fftw1
b1ae5c9047 added a way to automate sand production 2019-12-17 23:03:56 +01:00
TheBusyBiscuit
33adb7e79a Added Magnesium Salt and Magnesium-powered Generator 2019-12-17 01:37:09 +01:00
TheBusyBiscuit
59fb83e871 [CI skip] Removed CS-CoreLib Auto-Installer and reduced technical debt 2019-12-17 00:44:41 +01:00
TheBusyBiscuit
5730907da3
Merge pull request #1308 from creator3/master 
Fix drops in 1.15
 2019-12-17 00:19:10 +01:00
TheBusyBiscuit
989ed45a02 Added Salt to the GEO Miner (and reduced technical debt) 2019-12-17 00:18:04 +01:00
creator3
d698840e1f Use the actual tool item in calls to getDrops() 2019-12-16 11:47:47 -05:00
creator3
8b177df6c8 Fix drops in 1.15 2019-12-16 11:21:31 -05:00
TheBusyBiscuit
7268fb0505 [CI skip] Some more refactoring 2019-12-12 02:52:24 +01:00
TheBusyBiscuit
7cb0c521f6 [CI skip] Some refactoring 2019-12-12 01:45:55 +01:00
TheBusyBiscuit
aa9652cf88 Fixed Credits erroring for invalid usernames 2019-12-12 00:22:00 +01:00
TheBusyBiscuit
a91d926698 Re-formatted pom.xml 2019-12-12 00:20:01 +01:00
TheBusyBiscuit
db5f10ffe8 Fixed Credits + Reduced technical debt 2019-12-12 00:16:28 +01:00
TheBusyBiscuit
d66d34e85b
Merge branch 'master' into support/1.15 2019-12-11 23:15:33 +01:00
TheBusyBiscuit
3976e427a0 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2019-12-11 23:14:25 +01:00
TheBusyBiscuit
1ee411e4ca [CI skip] Reduced and Increased technical debt 2019-12-11 23:13:51 +01:00
Daniel Walsh
32be167679 Support 1.15 2019-12-11 16:41:00 +00:00
BurningBrimstone
642f5fe464
Added Ore Block Recipes 
Added following recipes to the electric press:
Diamond -> Diamond Block
Redstone -> Redstone Block
Lapis -> Lapis Block
Gold -> Gold Block
Iron -> Iron Block
 2019-12-11 00:56:19 -05:00
TheBusyBiscuit
460270f2a9
Merge pull request #1292 from SoSeDiK/kt 
Reworked & Fixed Knowledge Tome and a minor researching tweak
 2019-12-10 11:27:33 +01:00
TheBusyBiscuit
f74c078f61
Merge pull request #1293 from NihilistBrew/patch-1 
Grind andesite, granite, diorite to gravel
 2019-12-10 11:26:57 +01:00
TheBusyBiscuit
fd8a77dd79
Merge pull request #1288 from ramdon-person/patch-1 
Added Soulbound Trident
 2019-12-10 11:26:44 +01:00
TheBusyBiscuit
cdef18c8d7 [CI skip] Little improvement 2019-12-10 11:21:09 +01:00
TheBusyBiscuit
4c593760ba [CI skip] Some minor changes to metrics 2019-12-10 11:10:53 +01:00
TheBusyBiscuit
c8cc7818b2 [CI skip] Added two more contributor names, some refactoring 2019-12-10 11:00:04 +01:00
SoSeDiK
ac80575d8f Optimized item check 2019-12-10 09:55:56 +02:00
ramdon_person
052f80eeac
Update SlimefunSetup.java 2019-12-09 23:24:51 -08:00
BurningBrimstone
c879e5ebb7
Updated Quartz Namespace ID 
Changed NETHER_QUARTZ to QUARTZ.
 2019-12-09 13:19:09 -05:00
BurningBrimstone
60f16ee4ac
Added recipes 
Added recipes for iron and gold nuggets into their respective ingots. Also added a recipe for quartz into quartz blocks.

https://discordapp.com/channels/565557184348422174/627048923122499584/652563773793763343
 2019-12-09 12:40:51 -05:00
NihilistBrew
3d8add777a
Grind andesite, granite, diorite to gravel 
From https://discordapp.com/channels/565557184348422174/565569155848208404/650406015246008339
 2019-12-09 16:50:25 +01:00
TheBusyBiscuit
6c4c9cdc17 Some minor optimization 2019-12-09 09:52:49 +01:00
SoSeDiK
f0d04c75d8 Removed unnecessary action 2019-12-08 23:12:11 +02:00
SoSeDiK
27a8aa6236 Tweaked instant researching 
Don't start researching when it's instant, just throw fireworks & message about completion
 2019-12-08 22:55:17 +02:00
SoSeDiK
ce5ca5146e Reworked Knowledge Tome 2019-12-08 22:45:03 +02:00
SoSeDiK
912d2e9d7f
Fixed duplicate Grind Stone recipes 2019-12-08 17:44:02 +02:00
SoSeDiK
9b5bcfde44 Updated Crucible's mechanics 2019-12-08 15:24:22 +02:00
TheBusyBiscuit
ec44688459 Improved SlimefunItemStack#clone() 2019-12-08 13:09:15 +01:00
TheBusyBiscuit
8e72577974 Another optimization 2019-12-08 13:03:01 +01:00
TheBusyBiscuit
021bb3cbc8 Item optimizations 2019-12-08 12:59:55 +01:00
TheBusyBiscuit
39082938a8 Optimized items even further 2019-12-08 12:58:50 +01:00
TheBusyBiscuit
a22068b9ff Optimized SlimefunManager.isItemSimilar 2019-12-08 12:58:05 +01:00
TheBusyBiscuit
4699d6b94d [Ci skip] Another little change 2019-12-08 10:48:41 +01:00
TheBusyBiscuit
d12253c2f2 [Ci skip] Some small changes 2019-12-08 10:07:51 +01:00
TheBusyBiscuit
e5da69eb30
Merge pull request #1287 from WalshyDev/fix/contributors 
Allow for different GH and MC names + small improvements
 2019-12-08 09:31:06 +01:00
ramdon_person
17cf8cecdc
Update ResearchSetup.java 2019-12-07 12:30:38 -08:00
ramdon_person
c48cf894d4
Update SlimefunSetup.java 2019-12-07 11:56:11 -08:00
coder4321
4b8c948ad6
Update SlimefunSetup.java 2019-12-07 10:11:16 -08:00
coder4321
2281393a8b
Update SlimefunSetup.java 2019-12-07 10:09:50 -08:00
Daniel Walsh
f1ee2bd092 Added @NihilistBrew 2019-12-07 12:59:56 +00:00
coder4321
05f2751d58
Added Soulbound Trident 2019-12-07 01:25:34 -08:00
TheBusyBiscuit
72916b3e4f Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2019-12-07 10:05:11 +01:00
TheBusyBiscuit
f25bf75d67 Added Nether Gold Pan to the Electric Gold Pan 2019-12-07 10:04:54 +01:00
coder4321
f90f1c609f [CI skip] Updated Teleport Sounds and Fixed The “color codes are supported text” for elevators (#1283) 
* Update TeleportationSequence.java

* Update TeleportationSequence.java

* Update Elevator.java
 2019-12-07 09:41:26 +01:00
Daniel Walsh
cafc78b3fe Revert 5b9e9a4fb7 2019-12-06 21:47:18 +00:00
Daniel Walsh
5b9e9a4fb7 *screams internally* 2019-12-06 21:45:06 +00:00
Daniel Walsh
9156d478ef Add ajan-12 and LinoxGH 2019-12-06 21:35:17 +00:00
Daniel Walsh
3f179f9eaa oops, revert dis 2019-12-06 21:03:56 +00:00
Daniel Walsh
724c550204 Pasting is a true gem 2019-12-06 20:57:17 +00:00
Daniel Walsh
73a9eddf7f Fixed up 
Now doesn't accept special chars and added imgbot
 2019-12-06 20:56:03 +00:00
Daniel Walsh
a112e43b42 Allow for different GH and MC names + small improvements 2019-12-06 20:08:20 +00:00
TheBusyBiscuit
bcbe16253e Search now shows the Category of an Item 2019-12-06 14:20:42 +01:00
TheBusyBiscuit
43033ec3a4
Fixes #1280 2019-12-06 08:39:43 +01:00
SoSeDiK
a294e0db1f
Fixes #1281 2019-12-04 17:57:38 +02:00
SoSeDiK
732ae5e0dc
Added a new constructor 
Allows using the new item system.
 2019-12-04 13:35:08 +02:00
TheBusyBiscuit
da1dd294f6 Fixed Output Chest 2019-12-04 00:04:34 +01:00
TheBusyBiscuit
0fd7892ca4 Fixed blocks turning into CSCoreLib heads for all newly placed 
non-ticking blocks.
 2019-12-03 20:20:33 +01:00
TheBusyBiscuit
ae2a75b1d1
[CI skip] Merge pull request #1263 from poma123/patch-1 
AndroidMineEvent
 2019-12-03 00:37:23 +01:00
J3fftw1
c2230f1763 fixes dupe with geominer 2019-12-02 23:14:22 +01:00
poma123
1ddd46768e Changed android getter & updated javadocs 2019-12-02 16:21:55 +01:00
J3fftw1
5e52a5d3ab actually fixes it now 
removed if (list.size() % 2 != 0) list.add(null);
 2019-12-02 15:58:33 +01:00
poma123
426dd64a2b Added android getter and some javadocs 2019-12-02 15:15:48 +01:00
TheBusyBiscuit
8183a1a5af Fixes #1269 2019-12-01 20:55:46 +01:00
TheBusyBiscuit
958a3c0429 Fixed IllegalArgumentException for second-page credits 2019-12-01 19:22:23 +01:00
TheBusyBiscuit
2c64adc536 [CI skip] Minor UI change 2019-12-01 19:18:02 +01:00
TheBusyBiscuit
4ffc2888fd Fixed credits now showing everyone 2019-12-01 19:16:27 +01:00
TheBusyBiscuit
78df2e3ea5 Added Electric Press 2019-12-01 19:08:32 +01:00
TheBusyBiscuit
15d1d708f6 Fixed guide showing incomplete recipes for some machines 2019-12-01 18:59:14 +01:00
TheBusyBiscuit
20cdda2845 Fixed multi tools again 2019-12-01 18:42:33 +01:00
TheBusyBiscuit
3a608cfe4f Fixed multi tools 2019-12-01 18:39:37 +01:00
TheBusyBiscuit
accb018b22 Reduced a bit more technical debt 2019-12-01 18:37:43 +01:00
TheBusyBiscuit
b4faad9a72 Reduced technical debt on MultiTools 2019-12-01 18:35:15 +01:00
TheBusyBiscuit
b5cc48fd9b Changed Grappling Hook Recipe 2019-12-01 18:24:52 +01:00
TheBusyBiscuit
135fe34221
Merge pull request #1275 from J3fftw1/fix/fix-guide-issue-reeee 
Fixes #1272 & #1273
 2019-12-01 16:58:02 +01:00
TheBusyBiscuit
51b347afe8 Changed a few category icons 2019-12-01 16:54:59 +01:00
TheBusyBiscuit
552c907f21 Fixed some christmas items 2019-12-01 16:54:50 +01:00
J3fftw1
90bcc2196c Fixes #1272 & #1273 2019-12-01 16:28:57 +01:00
TheBusyBiscuit
dbab114d8f Possibly fixes #1266 2019-11-30 01:00:24 +01:00
TheBusyBiscuit
ae74412fac Enhanced randomizer algorithm for Gold Pans 2019-11-30 00:58:35 +01:00
TheBusyBiscuit
41327d637c Added new API class 2019-11-30 00:44:44 +01:00
TheBusyBiscuit
d5482f5496 [CI skip] Some additional API work 2019-11-28 20:23:39 +01:00
TheBusyBiscuit
6312d6c431
Merge pull request #1270 from pentabulge/master 
Updated recipes for Automated Panning Machine
 2019-11-28 19:36:53 +01:00
TheBusyBiscuit
3a809ad5ab
Merge pull request #1268 from SoSeDiK/researches 
Changed loading order
 2019-11-28 19:36:38 +01:00
TheBusyBiscuit
015159dfe8 Fixes #1264 2019-11-28 19:35:28 +01:00
TheBusyBiscuit
95e5da325b Restructured a bit of the API (for future versions) 2019-11-28 19:34:43 +01:00
penta
ebe9375a80
Added Iron Nuggets & Soul Sand drops to recipes 2019-11-28 17:34:12 +01:00
poma123
19b604f1de Added javadocs to #getBlock 2019-11-27 17:39:08 +01:00
poma123
88f5d412e5 Event calling added into "movedig" 2019-11-27 17:35:58 +01:00
SoSeDiK
b39a08d557
Changed loading order 
Fixes researching not being enabled by default when starting the server for the first time
 2019-11-27 18:29:45 +02:00
SoSeDiK
f63c290041
Minor changes to formatting 
- Fixed color
- Removed empty lines
- Changed formatting according to the other pages in the guide
 2019-11-27 18:23:11 +02:00
poma123
b069f9c354 Added AndroidMineEvent 2019-11-26 22:46:00 +01:00
J3fftw1
eea32be7dd removed empty lines 2019-11-26 19:30:52 +01:00
J3fftw1
23202d1cd6 few more fixes 2019-11-26 19:29:13 +01:00
J3fftw1
80094b4f1b
Merge branch 'master' into qol/sf-version 2019-11-26 19:26:44 +01:00
J3fftw1
334a1058b4 merged latest master 2019-11-26 19:16:39 +01:00
J3fftw1
b220f3a39e added cscorelib version to the guide 2019-11-26 19:00:35 +01:00
TheBusyBiscuit
61a58d87dd Added Iron Nuggets to Gold Pan drops 2019-11-26 00:48:47 +01:00
TheBusyBiscuit
c9bd5840e0 Added Nether Gold Pan 2019-11-26 00:39:54 +01:00