1
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 11:45:51 +00:00
Commit Graph

7213 Commits

Author SHA1 Message Date
TheBusyBiscuit
fc0b141dda
[CI skip] Updated issues template (beta) 2021-04-30 16:47:41 +02:00
TheBusyBiscuit
33ee417bdf
[CI skip] Updated issue beta template 2021-04-30 16:33:33 +02:00
TheBusyBiscuit
9f3f23fb75 Potentially fixed #2927 2021-04-30 16:18:24 +02:00
TheBusyBiscuit
5626ad2b2f
[CI skip] Renamed issue form 2021-04-30 14:18:42 +02:00
TheBusyBiscuit
1081fd8fc9
[CI skip] Merge pull request #3002 from Slimefun/issue-forms
New form-based Issue templates
2021-04-30 14:16:33 +02:00
Daniel Walsh
8b7fadd5b0
oops forgot attributes for all and removed empty optionals 2021-04-30 13:11:36 +01:00
Daniel Walsh
4de2242a4c
Add MC ver dropdown 2021-04-30 12:59:03 +01:00
Daniel Walsh
c2031f9e32
Update .github/ISSUE_TEMPLATE/bug-report.yml
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
2021-04-30 12:53:30 +01:00
Daniel Walsh
ce22f70af4
Change the name to be a little more accurate 2021-04-30 12:35:31 +01:00
Daniel Walsh
ed0149c6fb
Change name for now and make linter happy 2021-04-30 12:32:53 +01:00
Daniel Walsh
891e396e9c
First attempt at new forms 2021-04-30 12:30:46 +01:00
TheBusyBiscuit
a0695e0df4
Merge pull request #2994 from Mooy1/android-click-fix
Fix android click handler errors while moving
2021-04-30 12:51:34 +02:00
TheBusyBiscuit
5f1aeecdbf [CI skip] Updated changelog
Also fixed MultiCategory not respecting guide main page index.
2021-04-30 12:51:22 +02:00
TheBusyBiscuit
e609e9e0ae
Merge pull request #2993 from Mooy1/guide-history-fix
Fixed #2593
2021-04-30 12:36:47 +02:00
TheBusyBiscuit
5f3ca6eb8e
[CI skip] Updated changelog 2021-04-30 12:36:30 +02:00
TheBusyBiscuit
8c0fbfb295 More refactoring 2021-04-30 11:22:18 +02:00
TheBusyBiscuit
2382b940f1 Refactoring 2021-04-30 10:54:40 +02:00
TheBusyBiscuit
b92de66a27 [CI skip] Added missing import 2021-04-30 10:32:57 +02:00
TheBusyBiscuit
7c0b29f866
Merge branch 'master' into api/machine-operations 2021-04-30 10:13:25 +02:00
TheBusyBiscuit
7ac32085ca
[CI skip] Merge pull request #3001 from Slimefun/renovate/com.github.seeseemelk-mockbukkit-v1.16-0.x
Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v0.34.2
2021-04-30 10:12:39 +02:00
Renovate Bot
f7d787295d
Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v0.34.2 2021-04-29 20:07:09 +00:00
TheBusyBiscuit
c215940cb9 Marked some items as unplaceable 2021-04-29 21:18:32 +02:00
TheBusyBiscuit
586e0516cf [Ci skip] Some refactoring 2021-04-29 20:48:05 +02:00
TheBusyBiscuit
ced3cf9f50 Removed some deprecated methods 2021-04-29 20:37:54 +02:00
TheBusyBiscuit
90c8e2f278 Fixes #2999 2021-04-29 17:52:21 +02:00
TheBusyBiscuit
739a31454c
[CI skip] Merge pull request #3000 from Slimefun/renovate/org.sonarsource.scanner.maven-sonar-maven-plugin-3.x
Update dependency org.sonarsource.scanner.maven:sonar-maven-plugin to v3.9.0.2155
2021-04-29 17:30:42 +02:00
Renovate Bot
7b58127619
Update dependency org.sonarsource.scanner.maven:sonar-maven-plugin to v3.9.0.2155 2021-04-29 15:00:57 +00:00
TheBusyBiscuit
a02d809a72 Implemented Event. 2021-04-27 18:02:53 +02:00
TheBusyBiscuit
7bd588175b More work on this, added a new event and deprecated the old ones. 2021-04-27 17:08:09 +02:00
TheBusyBiscuit
57df9e8df9 Refactoring and documentation 2021-04-27 16:59:39 +02:00
a
a1619206ea Update ProgrammableAndroid.java 2021-04-27 09:36:16 -05:00
TheBusyBiscuit
29c568fdbf Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into api/machine-operations 2021-04-27 16:34:58 +02:00
a
bf5ada4eab Update ProgrammableAndroid.java 2021-04-27 09:34:52 -05:00
a
f79840bf66 changes 2021-04-27 09:26:56 -05:00
Riley
31ddf8e7de
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/guide/SurvivalSlimefunGuide.java
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
2021-04-26 18:55:24 -05:00
a
a1a6253961 Update ProgrammableAndroid.java 2021-04-26 18:43:10 -05:00
a
61ff68d34a fix 2021-04-26 18:15:07 -05:00
TheBusyBiscuit
757d7613ac [CI skip] Formatting 2021-04-26 18:06:25 +02:00
TheBusyBiscuit
71f3644078
[CI skip] Merge pull request #2991 from Slimefun/WalshyDev-patch-1
Update changelog per #2911
2021-04-26 15:46:00 +02:00
Daniel Walsh
46c7328603
Update changelog per #2911 2021-04-26 14:21:23 +01:00
Daniel Walsh
a8e84a7eff
Merge pull request #2911 from Rothes/master
Check lore to determine whether (Dis)Enchantable
2021-04-26 14:19:09 +01:00
Rothes
a59f5cb067 Update 2021-04-26 17:20:44 +08:00
TheBusyBiscuit
d55963d084
[CI skip] Updated README 2021-04-26 11:19:42 +02:00
TheBusyBiscuit
baeba0f52f
[CI skip] Updated README 2021-04-26 11:19:02 +02:00
TheBusyBiscuit
658d101706
[CI skip] Updated README 2021-04-26 11:13:37 +02:00
Rothes
ff58e53145 Update 2021-04-26 15:17:39 +08:00
Rothes
205f8d02b1
Merge branch 'master' into master 2021-04-26 12:28:03 +08:00
TheBusyBiscuit
f048d0276b
Merge pull request #2982 from martinbrom/fix/auto-enchanter-fixed-order
Fixes #2977
2021-04-25 20:13:59 +02:00
TheBusyBiscuit
a7835197a5 Some minor code improvements 2021-04-25 20:13:51 +02:00
TheBusyBiscuit
d91d9c2856 Removed Automated Crafting Chamber 2021-04-25 19:49:17 +02:00