TheBusyBiscuit
|
0b9ab8b6cc
|
Fixes #2446
|
2020-11-14 18:44:07 +01:00 |
|
TheBusyBiscuit
|
503dbc8367
|
Fixes #2418
|
2020-11-14 18:32:53 +01:00 |
|
CURVX
|
c4a08fe991
|
Changes req by TTB
|
2020-11-12 18:32:18 +05:30 |
|
TheBusyBiscuit
|
f1d4b50b67
|
One more tweak
|
2020-11-10 01:09:50 +01:00 |
|
TheBusyBiscuit
|
97cbe72a91
|
Some tweaks to the experimental bee wings
|
2020-11-10 01:04:15 +01:00 |
|
TheBusyBiscuit
|
e5b2924bee
|
Finished Bee Wings
|
2020-11-10 00:56:06 +01:00 |
|
TheBusyBiscuit
|
f3cf421f0e
|
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into bee-armor
|
2020-11-10 00:40:59 +01:00 |
|
TheBusyBiscuit
|
05e983917a
|
Added CoolerFeedPlayerEvent
|
2020-11-10 00:36:38 +01:00 |
|
TheBusyBiscuit
|
4d00ffc9af
|
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into code-quality/abstract-classes
|
2020-11-05 00:08:04 +01:00 |
|
TheBusyBiscuit
|
933bd9d9b9
|
Merge branch 'code-quality/abstract-classes' of https://github.com/Slimefun/Slimefun4.git into code-quality/abstract-classes
|
2020-11-05 00:07:50 +01:00 |
|
TheBusyBiscuit
|
f8306f0693
|
Small addition
|
2020-11-05 00:07:37 +01:00 |
|
TheBusyBiscuit
|
3170f143a2
|
Added a config option to disable network visualizations
|
2020-11-04 11:18:06 +01:00 |
|
TheBusyBiscuit
|
b80d8cfeda
|
[CI skip] Updated translators
|
2020-11-03 18:28:08 +01:00 |
|
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 |
|