1
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-21 12:15:50 +00:00
Commit Graph

659 Commits

Author SHA1 Message Date
TheBusyBiscuit
dd11cd0f30 [CI skip] Removed redundant interface 2020-09-22 18:38:40 +02:00
TheBusyBiscuit
0227e0cc30 [CI skip] Reduced technical debt 2020-09-21 12:51:13 +02:00
TheBusyBiscuit
1e408665a7 [Ci skip] Removed deprecated method 2020-09-13 12:32:30 +02:00
poma123
acd26b68dd We can use useable anyway 2020-09-11 20:29:23 +02:00
poma123
be5f793695 Fixed a bunch of typos 2020-09-11 20:02:17 +02:00
poma123
d22f7f31d8 Renamed to AsyncMachineProcessCompleteEvent 2020-09-10 14:36:41 +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
3a5c1ee22b [CI skip] Removed deprecated class 2020-09-08 12:22:57 +02:00
TheBusyBiscuit
fe22c5e9ed Fixes #2300 (and deprecated bStats) 2020-09-08 12:06:12 +02:00
TheBusyBiscuit
5c0aba7692 [CI skip] Moved Slimefun repository 2020-09-06 17:19:02 +02:00
TheBusyBiscuit
ec9133cf8a Small improvements 2020-09-05 14:45:42 +02:00
TheBusyBiscuit
f4869991ca Moved Nether goo to the appropriate package (+ more annotations) 2020-09-02 14:47:32 +02:00
TheBusyBiscuit
4ce4388218 [CI skip] More annotations :o 2020-09-02 13:53:10 +02:00
TheBusyBiscuit
f4091e931b Refactoring and some annotations 2020-09-02 10:31:35 +02:00
TheBusyBiscuit
93ff508603 More refactoring 2020-08-31 20:37:24 +02:00
TheBusyBiscuit
dc233997ae
Merge branch 'master' into refactoring/block-energy 2020-08-29 12:47:50 +02:00
TheBusyBiscuit
83b66232fa Fixes #2251 2020-08-28 20:03:45 +02:00
TheBusyBiscuit
b9b3d7f504 [CI skip] Removed deprecated class 2020-08-27 13:00:36 +02:00
TheBusyBiscuit
d998f3ec8c
Merge branch 'master' into refactoring/block-energy 2020-08-24 02:11:59 +02:00
TheBusyBiscuit
e839ece670 Reduced technical debt 2020-08-22 00:57:44 +02:00
TheBusyBiscuit
167326292d Maybe fixes #1951 (+ performance improvements) 2020-08-20 23:25:43 +02:00
TheBusyBiscuit
88be3e79ff
Merge branch 'master' into refactoring/block-energy 2020-08-20 16:55:35 +02:00
TheBusyBiscuit
aa22e7c9b2 [CI skip] A bit of refactoring and documentation 2020-08-19 13:54:46 +02:00
TheBusyBiscuit
923b59c6e7 [CI skip] Reduced technical debt 2020-08-11 16:28:52 +02:00
TheBusyBiscuit
b6ba6ce754 Updated all electric machines 2020-08-04 15:43:00 +02:00
TheBusyBiscuit
368d2f5798 Move block energy code to EnergyNetComponent 2020-08-04 13:29:45 +02:00
TheBusyBiscuit
e870f82afd Added piglin bartering to translation files 2020-08-04 12:40:08 +02:00
TheBusyBiscuit
dbed8b55d9
[CI skip] Merge pull request #2136 from dniym/PiglinDropsFgithub
Piglin drops fgithub
2020-08-04 12:25:26 +02:00
TheBusyBiscuit
54aa45d1d2
Merge branch 'master' into cleanup/blockplacing 2020-08-04 09:47:51 +02:00
TheBusyBiscuit
8f289dcdbe Fixes #2181 2020-08-04 01:15:14 +02:00
TheBusyBiscuit
6573a60016 Another commit full of cleanup stuff 2020-08-02 15:16:21 +02:00
TheBusyBiscuit
e52d062ef5 Reduced technical debt and clutter 2020-08-02 11:22:00 +02:00
TheBusyBiscuit
72a3f59d4b Removed a deprecated method 2020-08-01 15:56:14 +02:00
TheBusyBiscuit
6580e82606 Removed deprecated things 2020-08-01 12:31:05 +02:00
TheBusyBiscuit
df4f316675 Minor change 2020-07-31 01:39:10 +02:00
TheBusyBiscuit
dcb00dff20 [CI skip] Reduced technical debt 2020-07-31 01:08:23 +02:00
TheBusyBiscuit
63569fac57 Reduced technical debt and refactored a bit 2020-07-26 13:03:33 +02:00
dniym
9093e292a1 Rebased and re-commital of Piglin barter recipe addition. 2020-07-25 20:38:15 -04:00
TheBusyBiscuit
92ca696140 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4
into experimental

Conflicts:
	CHANGELOG.md
2020-07-25 14:27:12 +02:00
TheBusyBiscuit
33f7c42e2c Added an option to disable the "Ignoring duplicate block" message 2020-07-25 12:28:04 +02:00
TheBusyBiscuit
499bbdbf70
Merge branch 'master' into experimental 2020-07-24 16:36:08 +02:00
TheBusyBiscuit
47be5f16ce [CI skip] Refactoring, also removed more deprecated things 2020-07-24 16:33:09 +02:00
TheBusyBiscuit
1f7b75b823 Added Iron Golem Assembler (experimental) 2020-07-23 12:02:53 +02:00
Daniel Walsh
5e3eccfaa4 Fix some regex, finals and replace isPresent with ifPresent 2020-07-22 18:06:42 +01:00
TheBusyBiscuit
4e0df92b56 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4
into experimental

Conflicts:
	CHANGELOG.md
	src/main/java/io/github/thebusybiscuit/slimefun4/api/ErrorReport.java
	src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java
2020-07-20 12:46:12 +02:00
TheBusyBiscuit
3455c70d58 More refactoring 2020-07-15 19:19:38 +02:00
TheBusyBiscuit
eaaf0c5c01 Another performance improvement to Energy networks 2020-07-15 18:23:21 +02:00
TheBusyBiscuit
c574337318 Reworked Energy Providers (Generators) 2020-07-15 13:17:27 +02:00
TheBusyBiscuit
0735eaad83 [CI skip] Removed more deprecated code 2020-07-14 13:19:04 +02:00