mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-21 04:05:48 +00:00
Code Releases Activity
5,711 Commits 1 Branch 0 Tags 64 MiB
17fd2ec570
Commit Graph

2007 Commits

Author SHA1 Message Date
TheBusyBiscuit
e7f7a4d392
Merge pull request #2462 from uiytt/canUnlockResearchEvent 
Added PlayerPreResearchEvent
 2020-11-03 09:41:42 +01:00
uiytt
54ebfbb18c Last formatting fix 2020-11-02 20:06:03 +01:00
TheBusyBiscuit
1c5f2f650b Some refactoring and small fixes 2020-11-02 15:10:56 +01:00
TheBusyBiscuit
be001baa6e
[CI skip] Merge pull request #2508 from Sfiguz7/master 
Smallest documentation fix ever
 2020-11-02 12:38:37 +01:00
Sfiguz7
22fd9e549f Removed link from brewing stand 2020-11-02 01:04:53 +01:00
TheBusyBiscuit
25c3368ad3
Merge branch 'master' into code-quality/abstract-classes 2020-11-01 21:06:35 +01:00
TheBusyBiscuit
8536965962 Fixes #2517 2020-11-01 20:59:34 +01:00
TheBusyBiscuit
6ced4d166e Fixes #2527 2020-11-01 20:12:34 +01:00
TheBusyBiscuit
f2200cee44
[CI skip] Merge pull request #2516 from svr333/RenameMessage 
Change not-valid to invalid
 2020-10-31 10:08:48 +01:00
TheBusyBiscuit
210c8d20f4 Fixes #2499 2020-10-30 22:50:16 +01:00
TheBusyBiscuit
24e344e219 Fixed compatibility 2020-10-30 19:58:31 +01:00
TheBusyBiscuit
a3fb6c044b Fixed logging 2020-10-30 19:54:34 +01:00
TheBusyBiscuit
08d1def90c Fixed a small mistake 2020-10-30 19:50:05 +01:00
TheBusyBiscuit
f197e26a9c Did not mean to make this final yet 2020-10-30 19:42:58 +01:00
TheBusyBiscuit
508b5aa198 Refactored AGenerator 2020-10-30 19:37:39 +01:00
TheBusyBiscuit
d6567e4bfa Refactored AContainer 2020-10-30 19:31:22 +01:00
svr333
33f0d0a4bc Change not-valid to invalid 2020-10-29 15:06:52 +01:00
TheBusyBiscuit
12e7205280 [Ci skip] Added some unit tests 2020-10-28 12:52:23 +01:00
TheBusyBiscuit
28dda7caea
Merge pull request #2473 from CURVX/fix/armor-forge fixes #2469 
Fixes ArmorForge
 2020-10-28 12:15:34 +01:00
TheBusyBiscuit
6ad3b55e81
Merge pull request #2510 from Mooy1/Fix 
Fixes #2509
 2020-10-28 12:14:52 +01:00
TheBusyBiscuit
232ee74ceb Fixed contributors menu not showing everyone 2020-10-28 01:01:25 +01:00
TheBusyBiscuit
b3befbda49 Some code cleanup, documentation and paper optimizations 2020-10-28 00:44:35 +01:00
Mooy1
d8d98982b2 Update AContainer.java 2020-10-27 09:13:25 -05:00
Mooy1
7c39dbc3af this gud idk 2020-10-26 09:09:22 -05:00
Mooy1
9f88f24d40
Update src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AContainer.java 
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
 2020-10-26 08:51:20 -05:00
Mooy1
8608b9223d Fixes 2020-10-25 22:52:27 -05:00
Sfiguz7
386a9b6b95 Smallest documentation fix ever 2020-10-25 19:00:30 +01:00
TheBusyBiscuit
487108df14 Fixes #2505 2020-10-25 14:40:05 +01:00
TheBusyBiscuit
31b912ac70 Oops, forgot to commit that line 2020-10-25 11:55:27 +01:00
TheBusyBiscuit
7f9bed54ff Added some documentation and two guide item ui ids 2020-10-25 11:54:45 +01:00
TheBusyBiscuit
e9ad3ee357 Finished Cargo Filter implementation 2020-10-25 02:47:25 +02:00
Seggan
a7cbea70c2 Added validation 2020-10-24 13:30:32 -04:00
Seggan
9dfc4bdcf4 Removed redundant check 2020-10-24 13:23:44 -04:00
Seggan
7a877cda66 Instruction is now public 2020-10-24 13:08:03 -04:00
Seggan
88096ff7c4 Changed get and set scripts to public (from protected) 2020-10-24 13:00:11 -04:00
uiytt
e13694c063 Fixed name 2020-10-23 19:05:32 +02:00
uiytt
f6a3366aac imports order 2020-10-23 17:36:58 +02:00
uiytt
c56a55dd69 Again Formatting fix 
I will never see the end of these things  ...
 2020-10-23 17:31:27 +02:00
CURVX
f5af271445 Little refractoring, changes req. by TTB 2020-10-22 23:58:54 +05:30
uiytt
95a2dc08d4 Formatting fix 2020-10-22 16:06:11 +02:00
CURVX
4f762b37b6 Fixes#2447 2020-10-20 22:48:53 +05:30
Mooy1
536c5af857 Update ContributorsMenu.java 2020-10-20 10:34:35 -05:00
Mooy1
4d6d031bca
fix empty slot 2020-10-20 08:56:53 -05:00
TheBusyBiscuit
24806ab5d0 Adjusted CargoNet implementation 2020-10-20 14:22:17 +02:00
TheBusyBiscuit
aaec763a78 Added ItemFilter 2020-10-20 13:56:21 +02:00
CURVX
71ca1458fe Changes req. by TTB 2020-10-20 00:32:20 +05:30
CURVX
f651f960c0 Made ArmorForge extend BackpackCrafter 2020-10-19 22:56:14 +05:30
TheBusyBiscuit
c7960c292c
Merge pull request #2479 from CURVX/fix/ender-boots fixes #2478 
Fixes damage taken from Enderpearl with Enderboot on
 2020-10-19 12:49:58 +02:00
TheBusyBiscuit
1998c7746f
Merge pull request #2477 from J3fftw1/fix/#2470 
fixes #2470
 2020-10-18 19:22:04 +02:00
CURVX
c98292b08c Added changes req. by TTB 2020-10-18 22:32:36 +05:30
Panda.com
e3df3ab012 added tall_flowers.json and requested changes 2020-10-18 15:47:47 +02:00
Panda.com
dc025c7b28 fix 2020-10-18 14:31:54 +02:00
TheBusyBiscuit
734b853eb7 [CI skip] Reduced technical debt 2020-10-18 13:53:15 +02:00
Panda.com
3d364ee331 did requested changes 2020-10-18 13:48:38 +02:00
TheBusyBiscuit
e054fe6682 Fixes #2448 2020-10-18 13:17:18 +02:00
TheBusyBiscuit
c4bf0ecdd2 First step towards a task 2020-10-18 01:44:32 +02:00
TheBusyBiscuit
07eba9319a Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into 
bee-armor

Conflicts:
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/SlimefunBootsListener.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/setup/ResearchSetup.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/setup/SlimefunItemSetup.java
 2020-10-17 13:28:30 +02:00
TheBusyBiscuit
9f3e2bba7c [CI skip] Removed a troublesome config setting 2020-10-17 13:22:22 +02:00
TheBusyBiscuit
4aff61f3b1 Removed 1.13 support 2020-10-17 12:54:36 +02:00
TheBusyBiscuit
b976370d97 Reverted deprecation warning 2020-10-17 12:07:21 +02:00
uiytt
0a18c30890 Removed now useless method : research 2020-10-15 17:38:59 +02:00
TheBusyBiscuit
954b0075e6 [CI skip] Added package-info.json 2020-10-15 14:15:37 +02:00
TheBusyBiscuit
e18c7cb245 Fixed a dupe bug with mcMMO 2020-10-15 13:50:12 +02:00
uiytt
19133a05f9 Added guideClickInteraction method 
Added a method in research which manage what to do when a player click on a un-researched item in a guide
 2020-10-14 18:28:54 +02:00
CURVX
35fc23c428 Redundant import 2020-10-14 21:40:49 +05:30
CURVX
1437a8d555 Added FakeInv in ArmorForge 2020-10-14 21:34:57 +05:30
uiytt
08b32ce89f Typo fix 2020-10-14 17:39:16 +02:00
TheBusyBiscuit
b88bad3ef6 Fixes #2452 2020-10-14 14:56:52 +02:00
TheBusyBiscuit
42f849d891 Fixes #2423 2020-10-14 13:31:02 +02:00
TheBusyBiscuit
8440143f41 Refactoring 2020-10-14 13:20:12 +02:00
TheBusyBiscuit
1ffe2fd493 Fixes #2411 2020-10-14 00:51:21 +02:00
TheBusyBiscuit
de1eaca1dc Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git 2020-10-14 00:24:52 +02:00
TheBusyBiscuit
19de4c8476 Fixes #2454 (Added mcMMO support) 2020-10-14 00:24:01 +02:00
TheBusyBiscuit
bebb514635
Merge pull request #2467 from CURVX/fix/nether-goo-sheep 
Nether Goo "Tainted Sheep"
 2020-10-13 23:27:55 +02:00
TheBusyBiscuit
5c0b7e2ee2 Fixes #2468 2020-10-13 21:44:24 +02:00
CURVX
5982d9faaa Missed extra Parenthesis 2020-10-14 00:58:24 +05:30
CURVX
fdc958b6d8 Changes requested by TBB 2020-10-14 00:45:53 +05:30
CURVX
317477cd2c Tainted Sheep 2020-10-13 20:13:44 +05:30
TheBusyBiscuit
5aa300b0be
Merge pull request #2456 from Sfiguz7/master resolves #2369 
Added Basalt + Blackstone to Crucible
 2020-10-13 01:52:43 +02:00
uiytt
916d2bf4ba Removed empty line 2020-10-12 22:21:33 +02:00
uiytt
cd8603a6d8 Formatting fix 2020-10-12 22:12:37 +02:00
uiytt
9ded6d1ac4 Added PreCanUnlockResearchEvent 
This event is called when a player click to unlock a research
 2020-10-12 19:19:31 +02:00
TheBusyBiscuit
9e3ce9faf1 [CI skip] Formatting 2020-10-12 16:39:06 +02:00
Sfiguz7
2a8c0f7f82 Moved imports. 2020-10-12 16:25:22 +02:00
TheBusyBiscuit
9b1d6367b3 Some lore changes 2020-10-12 16:01:27 +02:00
TheBusyBiscuit
87d319cd02
Merge pull request #2382 from LinoxGH/EnergyConnector 
Energy Connectors
 2020-10-12 15:49:50 +02:00
TheBusyBiscuit
2e83b726bc [CI skip] Removed author tags from high-cohesion classes 2020-10-12 15:49:33 +02:00
TheBusyBiscuit
160c68b378 [CI skip] Refactoring and documentation 2020-10-12 15:04:27 +02:00
Sfiguz7
6cab415e37 Formatting, nerfed Basalt -> Lava 2020-10-12 14:10:16 +02:00
TheBusyBiscuit
612aad5d95 Fixes #2424 2020-10-12 12:11:28 +02:00
TheBusyBiscuit
3b7dd68164 Fixes #2450 2020-10-12 11:52:23 +02:00
TheBusyBiscuit
14e18d2962 Fixes #2455 2020-10-12 11:47:13 +02:00
Sfiguz7
fd58155a18 Added blackstone and basalt -> lava to crucibles 2020-10-12 09:10:52 +02:00
TheBusyBiscuit
f1dea4cab9
Merge pull request #2451 from CURVX/master 
Fix #2433
 2020-10-11 18:09:23 +02:00
CURVX
a9e64dbcfc Resolves #2433 2020-10-11 19:58:17 +05:30
CURVX
064453346d Resolves #2433 2020-10-11 19:49:34 +05:30
TheBusyBiscuit
c099f0bed4 Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git 2020-10-11 15:41:47 +02:00
TheBusyBiscuit
df4a87d9fa [Ci skip] A little bit of refactoring 2020-10-11 15:41:42 +02:00
LinoxGH
8eeb582ea3
Changed connector recipe. 2020-10-11 15:36:07 +03:00
TheBusyBiscuit
15884c65aa
Merge pull request #2435 from TheSilentPro/master fixes #2420 fixes #2422 
Stop unwanted actions from StrangeNetherGoo and Heavy Cream
 2020-10-11 13:46:40 +02:00
TheBusyBiscuit
b4b18f548f [CI skip] Reduced technical debt 2020-10-11 12:48:51 +02:00
Silent
7177946aae Changes pt2 2020-10-11 12:44:15 +02:00
TheBusyBiscuit
b80bc87ddc
Merge pull request #2440 from LinoxGH/ExplosivePickFix Fixed #2439 2020-10-11 12:27:27 +02:00
Silent
2902f74d10 Changes 2020-10-11 12:14:58 +02:00
LinoxGH
4980b078a1
Update BlockListener.java 2020-10-11 08:50:04 +03:00
LinoxGH
7af1e8144d
Update ExplosiveTool.java 2020-10-11 08:48:27 +03:00
TheBusyBiscuit
bc6ac0a4d1 [CI skip] Added Tape Measure Unit Tests 2020-10-11 01:27:38 +02:00
LinoxGH
957bcd9a3a
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/BlockListener.java 
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
 2020-10-11 02:01:54 +03:00
LinoxGH
d3c0a110a9
Changed capacitor recipe. 2020-10-11 00:31:06 +03:00
LinoxGH
ad505b6cef
Merge branch 'master' into EnergyConnector 2020-10-11 00:26:43 +03:00
LinoxGH
6082abb9b6
Merge branch 'master' into ExplosivePickFix 2020-10-11 00:23:59 +03:00
LinoxGH
bf3e6754cc
Changed event priorities. 2020-10-11 00:19:15 +03:00
LinoxGH
05d7ab5643
Update ExplosiveTool.java 2020-10-11 00:12:42 +03:00
Silent
dfe33b3534 Didn't know this existed 2020-10-10 22:05:50 +02:00
TheBusyBiscuit
bf25fc0b9d [CI skip] Added Unit Tests for new Item Settings 2020-10-10 21:55:54 +02:00
TheBusyBiscuit
594d322df2 [CI skip] Added EnumSetting 2020-10-10 21:20:25 +02:00
TheBusyBiscuit
a44f2fa626 [CI skip] Some cleanup 2020-10-10 20:46:17 +02:00
Silent
f9928e5e10 Add requested changes 2020-10-10 20:20:08 +02:00
TheBusyBiscuit
2da7efd380
[CI skip] Updated a javadocs tag 2020-10-10 19:18:15 +02:00
TheBusyBiscuit
b60c2382a5
[CI skip] Quickly added DoubleRangeSetting copy 2020-10-10 18:52:22 +02:00
Silent
cf0f7c37e0 Merge remote-tracking branch 'upstream/master' 2020-10-10 18:50:49 +02:00
Silent
0580a873ec Stop unwanted actions with StrangeNetherGoo and HeavyCream 2020-10-10 18:50:41 +02:00
TheBusyBiscuit
08bb3291c1
[CI skip] Updated translators list 2020-10-10 15:25:03 +02:00
LinoxGH
973f92c979
Update HeadTexture.java 
I guess this is correct now.
 2020-10-10 15:33:41 +03:00
TheBusyBiscuit
fd123b0bc2 [CI skip] Added another validation to head textures, looks at Linox 2020-10-10 14:22:14 +02:00
LinoxGH
49eca61a27
Changed HeadTexture. 2020-10-10 15:21:44 +03:00
LinoxGH
729facab61
Added Energy Connector texture. 2020-10-10 15:18:55 +03:00
TheBusyBiscuit
f895adde61 [CI skip] Reduced technical debt 2020-10-10 14:17:05 +02:00
TheBusyBiscuit
cf6add1149 Some small improvements before the merge 2020-10-10 13:36:07 +02:00
TheBusyBiscuit
72d3d24394 Two annotations! 2020-10-09 17:44:15 +02:00
TheBusyBiscuit
83e8010e29 Lots of refactoring 2020-10-09 17:39:21 +02:00
TheBusyBiscuit
aab665ffea
Merge branch 'master' into tags 2020-10-09 11:46:47 +02:00
LinoxGH
b2833dc5c0
Update MagicalZombiePills.java 2020-10-08 21:42:57 +03:00
TheBusyBiscuit
8c80ad4040 Cleanup 2020-10-08 19:05:23 +02:00
TheBusyBiscuit
d891d182b5 Intentionally messed up imports 2020-10-08 18:53:19 +02:00
TheBusyBiscuit
2d00f3e704
Merge branch 'master' into tags 2020-10-08 16:16:11 +02:00
LinoxGH
09a40d036e
Update src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/EnergyNetComponent.java 
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
 2020-10-08 16:04:01 +03:00
LinoxGH
40caa2d574
Update ResearchSetup.java 2020-10-08 16:02:53 +03:00
LinoxGH
b5c917f719
Fixed the lore. 2020-10-08 16:00:26 +03:00
LinoxGH
4bf08db1d1
Merge branch 'master' into EnergyConnector 2020-10-08 15:53:08 +03:00
TheBusyBiscuit
26066f2e6c Refactoring 2020-10-08 14:45:21 +02:00
TheBusyBiscuit
01d233af4d
Merge pull request #2402 from NCBPFluffyBear/gps-permission-fix 
GPS Control Panel and GEO Scanner access checks
 2020-10-08 14:37:16 +02:00
NCBPFluffyBear
90ccbb2261 Organized imports 2020-10-07 17:37:41 -05:00
TheBusyBiscuit
08ed8b21c8
Merge branch 'bee-armor' into beeArmor 2020-10-07 22:14:39 +02:00
NCBPFluffyBear
b577c1e4a3 Did changes 2020-10-07 13:45:49 -05:00
TheBusyBiscuit
126ccf3d01 Formatting 2020-10-07 18:43:55 +02:00
TheBusyBiscuit
7c3fc99b3a Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into 
tags

Conflicts:
	src/main/java/io/github/thebusybiscuit/slimefun4/api/items/ItemSetting.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/ProgrammableAndroid.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/miner/IndustrialMiner.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/ExplosiveTool.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/PickaxeOfVeinMining.java
	src/test/java/io/github/thebusybiscuit/slimefun4/testing/tests/items/implementations/tools/TestClimbingPick.java
 2020-10-07 18:38:26 +02:00
TheBusyBiscuit
fc26f959b6 [CI skip] Small formatting correction 2020-10-07 18:30:21 +02:00
TheBusyBiscuit
e4ddc7c452 [CI skip] Enforce OTBS. 2020-10-07 18:27:01 +02:00
poma123
cd00848795
Merge branch 'master' into tags 2020-10-07 17:55:26 +02:00
TheBusyBiscuit
ed8f0e243b Fixes #2405 2020-10-07 17:48:53 +02:00
TheBusyBiscuit
c3302d8cbd
Merge branch 'master' into tags 2020-10-07 17:44:27 +02:00
LinoxGH
eb572a1a77
Merge branch 'master' into EnergyConnector 2020-10-07 18:10:50 +03:00
TheBusyBiscuit
78515a3c61
Merge pull request #2396 from svr333/AddSticksRecipeToTableSaw 
Add sticks recipe to table saw
 2020-10-07 16:31:58 +02:00
TheBusyBiscuit
20a9c642fe Some code cleanup 2020-10-07 16:24:14 +02:00
poma123
7814bdcdee
Merge branch 'master' into tags 2020-10-07 16:11:41 +02:00
TheBusyBiscuit
80c4242dd7
Merge pull request #2384 from Seggan/master 
Added Elytra Cap
 2020-10-07 16:01:45 +02:00
Sfiguz7
91a7d9eacd Why u do dis IntelliJ >:( 2020-10-07 13:37:32 +02:00
Sfiguz7
46dca73e04 Forgot to clean crucible changes off 2020-10-07 13:36:11 +02:00
Sfiguz7
f8be447821 Fixes #2403 2020-10-07 13:32:10 +02:00
Sfiguz7
51d0ac0417 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-10-07 13:06:45 +02:00
svr333
85091516db Add generic fail message 2020-10-07 12:12:02 +02:00
NCBPFluffyBear
37f0715156 Added permission checks for the GEO Scanner and GPS Control Panel 2020-10-06 19:46:22 -05:00
Seggan
1ccd4c14ac More changes... 2020-10-06 15:41:14 -04:00
Seggan
960d53840a Moved import 2020-10-06 15:39:15 -04:00
Seggan
20aa5d49dc Merged ifs 2020-10-06 15:34:37 -04:00
Seggan
d1ede58f85 More requested changes... 2020-10-06 15:12:35 -04:00
TheBusyBiscuit
47590ac972
Merge branch 'master' into tags 2020-10-06 21:07:49 +02:00
TheBusyBiscuit
d09a7e0f93 Fixes #2391 2020-10-06 21:05:39 +02:00
TheBusyBiscuit
07c84af3b5 Added NotConfigurable attribute 2020-10-06 21:01:18 +02:00
TheBusyBiscuit
f98d048b55 [CI skip] Reduced technical debt 2020-10-06 20:20:02 +02:00
svr333
fa394b4d44 Call planks.isPresent() 2020-10-06 19:50:57 +02:00
svr333
e6ed632dd0 Refactor + undo placeholder item in displayrecipes 2020-10-06 11:53:51 +02:00
svr333
37242fe64a Throw out variables 2020-10-06 01:26:23 +02:00
Seggan
db6295616e Did more requested changes 2020-10-05 17:05:05 -04:00
Seggan
a4dc1428bc Changed protection check (untested) 2020-10-05 17:02:09 -04:00
svr333
8c44c583cf Add nullable tag 2020-10-05 23:01:30 +02:00
svr333
6e17cd2cc5 Extract to method 2020-10-05 23:00:44 +02:00
Seggan
4b3e31a8c7 Renamed listener 2020-10-05 16:56:25 -04:00
svr333
997dce8970 Extract to method && remove redundant if statement 2020-10-05 20:07:56 +02:00
Senne Van Rompaey
94c5068cc2
Move version check 
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
 2020-10-05 20:03:50 +02:00
svr333
038efb8391 Add myself @author 2020-10-05 20:00:31 +02:00
svr333
3ef0a67db6 Add @Nonnull 2020-10-05 19:59:55 +02:00
svr333
9242978a96 Remove redundant if-else && Consume item after output 2020-10-05 19:57:50 +02:00
svr333
ff0c2b7984 Change else if to else 2020-10-05 19:37:12 +02:00
svr333
868a7e566b Change else if to else 2020-10-05 19:34:26 +02:00
svr333
b237d076bf Add version check 2020-10-05 19:34:00 +02:00
svr333
983bc103d3 Refactor 2020-10-05 18:43:11 +02:00
svr333
fe50d96270 Remove empty line 2020-10-05 18:38:58 +02:00
Sfiguz7
1d1adf9b3e Added mc version check 2020-10-05 17:25:57 +02:00
svr333
62aa2dd0d8 Simplify displayrecipes and use planks.isTagged() 2020-10-05 17:23:40 +02:00
Sfiguz7
87dedf3492 Swapped order as it makes more sense + consistency 2020-10-05 17:17:16 +02:00
Sfiguz7
cff403a7b9 Added blackstone and basalt to crucible's recipes 2020-10-05 17:15:53 +02:00
Senne Van Rompaey
8675e96e75
Add space 
Co-authored-by: LinoxGH <54643600+LinoxGH@users.noreply.github.com>
 2020-10-05 17:11:56 +02:00
Seggan
58e2b9ab3b Added default annonation 2020-10-05 11:01:58 -04:00
Seggan
bb24bdd837 Merge remote-tracking branch 'upstream/master' 2020-10-05 10:55:26 -04:00
svr333
0e57d94d61 Add Sticks recipe to Table Saw 2020-10-05 16:28:23 +02:00
svr333
b3ca362df2 Add DisplayRecipes 2020-10-05 16:06:19 +02:00
Seggan
51dd53cae1 Moved elytra cap to magical gadgets 2020-10-05 10:01:38 -04:00
svr333
0a19f76787 Use PigZombie over Entity 2020-10-05 15:56:54 +02:00
svr333
b8c2c97766 Add missing import 2020-10-05 15:43:24 +02:00
svr333
6c568bd7d1 Fix imports 2020-10-05 15:38:21 +02:00
svr333
8d3f432158 Use instanceof 2020-10-05 15:37:45 +02:00
svr333
3ca6e612cc Add @nonnull 2020-10-05 15:33:48 +02:00
svr333
ab5251021a Fix compile error 2020-10-05 15:30:23 +02:00
svr333
e65341eb0b Add newline 2020-10-05 15:29:02 +02:00
svr333
a2fb390a8e Extra code to separate methods 2020-10-05 15:28:43 +02:00
svr333
a01d33fea3 Refactor 2020-10-05 15:25:11 +02:00
svr333
21bf7cf607 Refactor slightly 2020-10-05 15:00:21 +02:00
svr333
ab92df7693 Fix imports 2020-10-05 14:58:53 +02:00
svr333
e1488c0811 Add Zombified piglin conversion 2020-10-05 14:56:40 +02:00
svr333
5ec63f632f Update lore 2020-10-05 14:20:44 +02:00
Seggan
7f1bddb759 Merge branch 'text_revisions' 2020-10-04 22:05:22 -04:00
Seggan
3dcd5942aa Changed some linguistic things (Biscuit needs to be an English professor) 2020-10-04 22:03:48 -04:00
Seggan
d6df2ea00c Added crash protection type 2020-10-04 21:59:10 -04:00
Seggan
8bbef4c911 Did some requested changes 2020-10-04 16:08:42 -04:00
Seggan
f87a1d3660 Added research check 2020-10-04 15:07:11 -04:00
Seggan
107125802c Forgot to change id. Reverted back to setDamage() 2020-10-04 15:02:21 -04:00
Seggan
1dbdd077ec Updated recipe 2020-10-04 14:43:30 -04:00
Seggan
70be1c38d0 Did requested changes 2020-10-04 14:42:50 -04:00
TheBusyBiscuit
b32dc0b727 @poma123 for the rescue 2020-10-04 13:40:41 +02:00
TheBusyBiscuit
655b429f0d Added a new super tag 2020-10-04 13:31:52 +02:00
TheBusyBiscuit
76e42fa9af Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into tags 2020-10-04 13:17:13 +02:00
TheBusyBiscuit
5753def8e9 Hey unit tests, you work now, k pls? 2020-10-04 12:42:59 +02:00
TheBusyBiscuit
c8d2bea162 Maybe now? 👀 2020-10-04 12:16:32 +02:00
b10n1k
91a5b56947 Define a constant instead of duplicating "backpacks." 2020-10-04 12:09:04 +02:00
TheBusyBiscuit
ceadd2147f Added a debug line to finally fix this unit test 2020-10-04 11:51:03 +02:00
TheBusyBiscuit
2ff105dabe Maybe fixed the unit tests? 2020-10-04 11:22:56 +02:00
TheBusyBiscuit
4df4f6d4c9 More Climbing Pick unit tests which may give us better context? 2020-10-04 11:04:35 +02:00
LinoxGH
7dffd84687
Update ResearchSetup.java 2020-10-04 09:06:21 +03:00
LinoxGH
38f891ca98
Some code improvements. 
(at least that's what was meant to be done)
 2020-10-04 09:01:24 +03:00
LinoxGH
6347e2f6ca
Merge branch 'master' into beeArmor 2020-10-04 08:48:05 +03:00
TheBusyBiscuit
50777ac546 A bit of code cleanup and docs 2020-10-04 02:55:11 +02:00
TheBusyBiscuit
8bbdc37130 Refactored Climbing Picks and added Tags 2020-10-04 02:28:59 +02:00
TheBusyBiscuit
0e6fc92e28
Merge branch 'master' into tags 2020-10-04 00:46:37 +02:00
TheBusyBiscuit
de17060070
Merge pull request #2383 from LinoxGH/SfGuideEvent 
Added SlimefunGuideOpenEvent.
 2020-10-04 00:40:15 +02:00
TheBusyBiscuit
87196ef3b9
Merge pull request #2385 from Mooy1/master 
Speed can affect enchanter/disenchanter times, fixed pom typo
 2020-10-04 00:40:01 +02:00
LinoxGH
dbe8755e4a
Update src/main/java/io/github/thebusybiscuit/slimefun4/api/events/SlimefunGuideOpenEvent.java 
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
 2020-10-04 01:04:41 +03:00
Mooy1
e33c70e189 removed accidental space 2020-10-03 16:33:29 -05:00
Mooy1
766d0bbc53 Speed can affect enchanter/disenchanter times, fixed pom typo 2020-10-03 16:27:54 -05:00
Seggan
d9aceea4d6 Changed recipe 2020-10-03 17:27:22 -04:00
LinoxGH
ca76411c40
Update SlimefunGuideListener.java 2020-10-04 00:26:29 +03:00
LinoxGH
2ed707b3b3
Update SlimefunGuideOpenEvent.java 2020-10-04 00:25:27 +03:00
Seggan
99e0c542ae Moved crash helmet item declaration 2020-10-03 17:22:03 -04:00
Seggan
b540bc05bc Crash helmet now works 2020-10-03 17:20:29 -04:00
LinoxGH
f7c3a5b052
Did some more requestes changes. 2020-10-04 00:09:52 +03:00
LinoxGH
4316f83a00
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/SlimefunGuideListener.java 
Co-authored-by: poma123 <25465545+poma123@users.noreply.github.com>
 2020-10-04 00:06:20 +03:00
LinoxGH
0e530fe13a
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/SlimefunGuideListener.java 
Co-authored-by: poma123 <25465545+poma123@users.noreply.github.com>
 2020-10-04 00:06:13 +03:00
LinoxGH
fc999ae60d
Update SlimefunGuideListener.java 2020-10-03 23:57:27 +03:00
LinoxGH
41fc987083
Did more requested changes. 2020-10-03 23:56:51 +03:00