mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-21 20:25:54 +00:00
Code Releases Activity
4,538 Commits 1 Branch 0 Tags 64 MiB
ff9a6f7a3e
Commit Graph

1099 Commits

Author SHA1 Message Date
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
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
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
TheBusyBiscuit
6fd90bde4f Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into tags 2020-09-10 16:19:23 +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
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
e628ad2685 Added MachineProcessCompleteEvent 2020-09-09 14:25:20 +02:00
TheBusyBiscuit
f2eeadb24b [CI skip] Some minor changes 2020-09-09 13:18:43 +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
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
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
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
TheBusyBiscuit
06498e3f63 Added Unit Test and loop detection 2020-09-07 01:13:25 +02:00
TheBusyBiscuit
773996617d Added Tags 2020-09-07 00:31:26 +02:00
TheBusyBiscuit
5c0aba7692 [CI skip] Moved Slimefun repository 2020-09-06 17:19:02 +02:00
Ome_R
490db0d719
Fixed teleporters not functioning if the teleport event is cancelled 2020-09-06 12:22:37 +03:00
TheBusyBiscuit
be5f1ed8ee
Merge pull request #2285 from NCBPFluffyBear/multitool-offhand-fix 
Multitool offhand hunger consumption fix
 2020-09-05 22:15:47 +02:00
FluffyBear
6e33549006 Got rid of the extra imports 2020-09-05 15:11:29 -05:00
FluffyBear
069b183b68 Changed it back 2020-09-05 15:11:08 -05:00
FluffyBear
c9fd33318e Did changes 2020-09-05 11:12:14 -05:00
TheBusyBiscuit
2791da3796 A bit redundant 2020-09-05 15:01:26 +02:00
TheBusyBiscuit
ec9133cf8a Small improvements 2020-09-05 14:45:42 +02:00
TheBusyBiscuit
8061df9b5e [CI skip] More nullability annotations 2020-09-05 13:56:56 +02:00
FluffyBear
6f49044998 Applied fix 2020-09-04 10:20:11 -05:00
FluffyBear
6ac3c9698b Fixed dual wielding problem with shears 2020-09-04 09:29:08 -05:00
TheBusyBiscuit
0c3cb5db37
[CI skip] Updated it once again 2020-09-04 10:02:20 +02:00
TheBusyBiscuit
deb9e0c711
[CI skip] Updated translator list 2020-09-04 09:57:34 +02:00
FluffyBear
cf1c58dd8b Got rid of charge command from this branch 2020-09-04 00:54:06 -05:00
FluffyBear
90309dabe1 Fixed multitools consuming hunger when used in offhand 2020-09-04 00:46:26 -05:00