TheBusyBiscuit
|
ff9a6f7a3e
|
Fixed Unit Tests
|
2020-09-11 10:44:00 +02:00 |
|
TheBusyBiscuit
|
ed66ee9b79
|
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into
tags
Conflicts:
CHANGELOG.md
|
2020-09-11 10:33:02 +02:00 |
|
TheBusyBiscuit
|
05fd47a170
|
Merge pull request #2309 from NCBPFluffyBear/charge-command
Charge command
|
2020-09-11 10:31:45 +02:00 |
|
TheBusyBiscuit
|
5989fde476
|
[CI skip] Updated changelog
|
2020-09-11 10:21:07 +02:00 |
|
NCBPFluffyBear
|
37c0ce4ce0
|
Organized imports
|
2020-09-10 23:52:19 -05:00 |
|
TheBusyBiscuit
|
74edbe499c
|
Fixes #2238
|
2020-09-11 00:07:26 +02:00 |
|
NCBPFluffyBear
|
128bc65417
|
Did requested changes
|
2020-09-10 16:36:52 -05:00 |
|
NCBPFluffyBear
|
57f52f62c6
|
Did requested changes
|
2020-09-10 16:27:50 -05:00 |
|
NCBPFluffyBear
|
6b95ed0293
|
Added Charge Command
|
2020-09-10 16:02:03 -05:00 |
|
FluffyBear
|
e1b9238cf1
|
Merge pull request #2 from Slimefun/master
Update
|
2020-09-10 15:45:37 -05:00 |
|
TheBusyBiscuit
|
6fd90bde4f
|
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into tags
|
2020-09-10 16:19:23 +02:00 |
|
TheBusyBiscuit
|
4d1407563f
|
Merge pull request #2306 from poma123/patch-1
Made MachineProcessCompleteEvent async
|
2020-09-10 15:56:49 +02:00 |
|
poma123
|
d22f7f31d8
|
Renamed to AsyncMachineProcessCompleteEvent
|
2020-09-10 14:36:41 +02:00 |
|
poma123
|
6e4ad1345f
|
This has to be async
|
2020-09-10 13:58:58 +02:00 |
|
TheBusyBiscuit
|
6c7af43574
|
Merge pull request #2304 from poma123/develop/machine-process-complete-event
MachineProcessCompleteEvent
|
2020-09-10 12:16:35 +02:00 |
|
TheBusyBiscuit
|
8a3165e9ba
|
Fixed some tags and added glass
|
2020-09-10 00:33:47 +02:00 |
|
TheBusyBiscuit
|
00e71904b2
|
Merge pull request #2305 from LinoxGH/patch-3
Edited markDirty() to clean connectorCache
|
2020-09-09 23:33:06 +02:00 |
|
LinoxGH
|
1b80c698c5
|
Fixed a typo.
|
2020-09-09 21:36:29 +03:00 |
|
TheBusyBiscuit
|
19c67a2266
|
Unit Test should no longer fail
|
2020-09-09 15:52:59 +02:00 |
|
LinoxGH
|
6d6359ce26
|
Improved the code.
|
2020-09-09 16:50:04 +03:00 |
|
TheBusyBiscuit
|
9655761ab1
|
Micro-optimizations Walshy would be proud of
|
2020-09-09 15:43:44 +02:00 |
|
TheBusyBiscuit
|
035e35a067
|
Implemented tags in more occurences
|
2020-09-09 15:34:58 +02:00 |
|
poma123
|
8f34365aaa
|
Removed redundant annotations
|
2020-09-09 14:51:21 +02:00 |
|
poma123
|
87543ccb83
|
Fixed javadocs
|
2020-09-09 14:35:17 +02:00 |
|
poma123
|
a4eb852b19
|
Added annotations
|
2020-09-09 14:34:01 +02:00 |
|
poma123
|
25bd60fd0e
|
Fixed a typo
|
2020-09-09 14:26:01 +02:00 |
|
poma123
|
274c5ada2f
|
Minor improvement
|
2020-09-09 14:25:47 +02:00 |
|
poma123
|
e628ad2685
|
Added MachineProcessCompleteEvent
|
2020-09-09 14:25:20 +02:00 |
|
TheBusyBiscuit
|
d63ff915ce
|
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into tags
|
2020-09-09 13:19:04 +02:00 |
|
TheBusyBiscuit
|
f2eeadb24b
|
[CI skip] Some minor changes
|
2020-09-09 13:18:43 +02:00 |
|
TheBusyBiscuit
|
a0d2fc3953
|
Merge pull request #2302 from Slimefun/renovate/com.github.thebusybiscuit-cs-corelib2-0.x
Update dependency com.github.TheBusyBiscuit:CS-CoreLib2 to v0.26
|
2020-09-09 11:32:07 +02:00 |
|
TheBusyBiscuit
|
a30d41ea9e
|
[CI skip] Updated change log
|
2020-09-09 11:31:52 +02:00 |
|
TheBusyBiscuit
|
7fdf10cc8b
|
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into
tags
Conflicts:
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/PickaxeOfVeinMining.java
|
2020-09-08 12:37:25 +02:00 |
|
Renovate Bot
|
c7a1336e18
|
Update dependency com.github.TheBusyBiscuit:CS-CoreLib2 to v0.26
|
2020-09-08 10:30:17 +00:00 |
|
TheBusyBiscuit
|
3a5c1ee22b
|
[CI skip] Removed deprecated class
|
2020-09-08 12:22:57 +02:00 |
|
TheBusyBiscuit
|
23143cd576
|
Merge pull request #2297 from LinoxGH/patch-2
Possibly fixes #2296.
|
2020-09-08 12:06:57 +02:00 |
|
TheBusyBiscuit
|
fe22c5e9ed
|
Fixes #2300 (and deprecated bStats)
|
2020-09-08 12:06:12 +02:00 |
|
TheBusyBiscuit
|
0c11a41d1c
|
Merge pull request #2301 from WalshyDev/performance/666-performance-fixes
Micro-optimisations for #666
|
2020-09-08 11:31:37 +02:00 |
|
Daniel Walsh
|
53dea5e195
|
Some good old micro-optimisations
|
2020-09-07 22:38:23 +01:00 |
|
LinoxGH
|
956d8ed078
|
Did the requested changes.
|
2020-09-07 18:47:51 +03:00 |
|
TheBusyBiscuit
|
81a8732f41
|
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into tags
|
2020-09-07 13:06:50 +02:00 |
|
TheBusyBiscuit
|
7c8b8e0c59
|
Discord webhook, please work
|
2020-09-07 13:02:59 +02:00 |
|
TheBusyBiscuit
|
4fe2aee565
|
Another mistake
|
2020-09-07 13:00:15 +02:00 |
|
TheBusyBiscuit
|
7e7fde9a47
|
Slight correction
|
2020-09-07 12:59:38 +02:00 |
|
TheBusyBiscuit
|
239df5cc30
|
[CI skip] Updated change log
|
2020-09-07 12:45:27 +02:00 |
|
TheBusyBiscuit
|
3220a124aa
|
Added more Unit Tests
|
2020-09-07 12:41:04 +02:00 |
|
LinoxGH
|
cdd7dc9232
|
Forgot to change a small part.
|
2020-09-07 13:38:12 +03:00 |
|
LinoxGH
|
7cd2e53bf1
|
Possibly fixes #2296.
|
2020-09-07 13:22:59 +03:00 |
|
TheBusyBiscuit
|
5b72faddc3
|
Implemented tags
|
2020-09-07 11:08:39 +02:00 |
|
TheBusyBiscuit
|
b09c4af900
|
Added documentation
|
2020-09-07 03:12:31 +02:00 |
|