Commit 5035f26
committed
Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 into stable
1,226 files changed
Lines changed: 7270 additions & 325068 deletions
File tree
- .github
- workflows
- docs
- index-files
- io/github/thebusybiscuit/slimefun4
- api
- class-use
- events
- class-use
- exceptions
- class-use
- geo
- class-use
- gps
- class-use
- items
- class-use
- network
- class-use
- player
- class-use
- core
- attributes
- class-use
- class-use
- commands
- class-use
- subcommands
- class-use
- guide
- class-use
- networks/energy
- class-use
- services
- class-use
- github
- class-use
- localization
- class-use
- metrics
- class-use
- plugins
- class-use
- implementation
- guide
- class-use
- items
- altar
- class-use
- androids
- class-use
- armor
- class-use
- blocks
- class-use
- cargo
- class-use
- class-use
- electric
- class-use
- gadgets
- class-use
- generators
- class-use
- machines
- class-use
- reactors
- class-use
- food
- class-use
- geo
- class-use
- gps
- class-use
- magical
- class-use
- medical
- class-use
- multiblocks
- class-use
- tools
- class-use
- weapons
- class-use
- listeners
- class-use
- resources
- class-use
- setup
- class-use
- tasks
- class-use
- utils
- class-use
- holograms
- class-use
- itemstack
- class-use
- jquery
- external/jquery
- images
- jszip-utils/dist
- jszip/dist
- me/mrCookieSlime/Slimefun
- Lists
- class-use
- Objects
- SlimefunItem
- abstractItems
- class-use
- class-use
- interfaces
- class-use
- multiblocks
- class-use
- class-use
- handlers
- class-use
- Setup
- class-use
- api
- class-use
- energy
- class-use
- inventory
- class-use
- item_transport
- class-use
- class-use
- resources
- lib
- src/main
- java
- io/github/thebusybiscuit/slimefun4
- api
- events
- exceptions
- geo
- gps
- items
- network
- player
- core
- attributes
- categories
- commands
- subcommands
- guide
- options
- networks
- cargo
- energy
- services
- github
- localization
- metrics
- plugins
- implementation
- guide
- items
- androids
- blocks
- cargo
- electric
- gadgets
- generators
- machines
- reactors
- food
- geo
- gps
- magical
- talismans
- multiblocks
- seasonal
- tools
- weapons
- listeners
- setup
- tasks
- utils
- holograms
- itemstack
- me/mrCookieSlime/Slimefun
- Lists
- Objects
- SlimefunItem
- abstractItems
- interfaces
- multiblocks
- handlers
- Setup
- api
- energy
- inventory
- resources
- languages
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
5 | | - | |
| 5 | + | |
| 6 | + | |
6 | 7 | | |
7 | 8 | | |
8 | 9 | | |
| |||
File renamed without changes.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
13 | 13 | | |
14 | 14 | | |
15 | 15 | | |
16 | | - | |
| 16 | + | |
17 | 17 | | |
18 | 18 | | |
19 | 19 | | |
20 | | - | |
| 20 | + | |
21 | 21 | | |
22 | 22 | | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
15 | 15 | | |
16 | 16 | | |
17 | 17 | | |
18 | | - | |
| 18 | + | |
19 | 19 | | |
20 | 20 | | |
21 | 21 | | |
22 | 22 | | |
23 | 23 | | |
24 | 24 | | |
25 | | - | |
| 25 | + | |
| 26 | + | |
26 | 27 | | |
27 | 28 | | |
28 | 29 | | |
29 | 30 | | |
30 | 31 | | |
31 | 32 | | |
32 | | - | |
33 | | - | |
34 | 33 | | |
35 | 34 | | |
| 35 | + | |
36 | 36 | | |
37 | | - | |
38 | | - | |
39 | | - | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
40 | 40 | | |
41 | 41 | | |
42 | 42 | | |
43 | | - | |
44 | | - | |
45 | | - | |
46 | | - | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
47 | 47 | | |
48 | | - | |
49 | | - | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
50 | 51 | | |
51 | 52 | | |
52 | 53 | | |
| |||
This file was deleted.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
2 | | - | |
3 | 1 | | |
4 | 2 | | |
| 3 | + | |
5 | 4 | | |
6 | | - | |
| 5 | + | |
7 | 6 | | |
8 | | - | |
9 | | - | |
10 | | - | |
11 | 7 | | |
12 | | - | |
13 | 8 | | |
14 | | - | |
15 | 9 | | |
16 | | - | |
17 | | - | |
18 | | - | |
19 | 10 | | |
20 | | - | |
21 | | - | |
22 | | - | |
23 | 11 | | |
24 | | - | |
25 | | - | |
26 | | - | |
27 | 12 | | |
28 | | - | |
29 | | - | |
30 | | - | |
31 | 13 | | |
32 | | - | |
33 | | - | |
34 | | - | |
35 | 14 | | |
36 | | - | |
37 | | - | |
38 | | - | |
39 | 15 | | |
40 | 16 | | |
41 | 17 | | |
42 | | - | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
43 | 75 | | |
44 | 76 | | |
| 77 | + | |
45 | 78 | | |
46 | 79 | | |
47 | 80 | | |
| |||
88 | 121 | | |
89 | 122 | | |
90 | 123 | | |
| 124 | + | |
91 | 125 | | |
92 | 126 | | |
93 | 127 | | |
94 | 128 | | |
95 | 129 | | |
| 130 | + | |
96 | 131 | | |
97 | 132 | | |
98 | 133 | | |
99 | 134 | | |
100 | 135 | | |
| 136 | + | |
101 | 137 | | |
102 | 138 | | |
103 | 139 | | |
| |||
121 | 157 | | |
122 | 158 | | |
123 | 159 | | |
| 160 | + | |
124 | 161 | | |
125 | 162 | | |
126 | 163 | | |
| |||
139 | 176 | | |
140 | 177 | | |
141 | 178 | | |
| 179 | + | |
142 | 180 | | |
143 | 181 | | |
144 | 182 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
15 | 15 | | |
16 | 16 | | |
17 | 17 | | |
| 18 | + | |
18 | 19 | | |
19 | 20 | | |
20 | 21 | | |
| |||
24 | 25 | | |
25 | 26 | | |
26 | 27 | | |
27 | | - | |
| 28 | + | |
28 | 29 | | |
29 | 30 | | |
30 | 31 | | |
| |||
51 | 52 | | |
52 | 53 | | |
53 | 54 | | |
54 | | - | |
| 55 | + | |
55 | 56 | | |
56 | 57 | | |
57 | 58 | | |
| |||
75 | 76 | | |
76 | 77 | | |
77 | 78 | | |
| 79 | + | |
78 | 80 | | |
| 81 | + | |
| 82 | + | |
79 | 83 | | |
80 | 84 | | |
81 | | - | |
| 85 | + | |
| 86 | + | |
82 | 87 | | |
83 | 88 | | |
84 | 89 | | |
| |||
0 commit comments