File tree
39 files changed
+172
-119
lines changed- src/main
- java/com/glisco/conjuring
- blocks
- conjurer
 - gem_tinkerer
 - soul_weaver
 - soulfire_forge
 
 - client/ber
 - compat
- patchouli
 - rei
 
 - entities
 - items/soul_alloy_tools
 - mixin
 
 - resources
- data
- conjuring/damage_type
 - minecraft/tags/damage_type
 
 
 
 
39 files changed
+172
-119
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
 | |||
60 | 60 |  | |
61 | 61 |  | |
62 | 62 |  | |
63 |  | - | |
 | 63 | + | |
64 | 64 |  | |
65 | 65 |  | |
66 | 66 |  | |
 | |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
 | |||
2 | 2 |  | |
3 | 3 |  | |
4 | 4 |  | |
5 |  | - | |
6 |  | - | |
7 |  | - | |
8 |  | - | |
 | 5 | + | |
 | 6 | + | |
 | 7 | + | |
 | 8 | + | |
9 | 9 |  | |
10 |  | - | |
 | 10 | + | |
11 | 11 |  | |
12 | 12 |  | |
13 | 13 |  | |
14 |  | - | |
 | 14 | + | |
15 | 15 |  | |
16 | 16 |  | |
17 | 17 |  | |
18 | 18 |  | |
19 | 19 |  | |
20 |  | - | |
 | 20 | + | |
21 | 21 |  | |
22 | 22 |  | |
23 |  | - | |
 | 23 | + | |
24 | 24 |  | |
25 | 25 |  | |
26 |  | - | |
 | 26 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
 | |||
42 | 42 |  | |
43 | 43 |  | |
44 | 44 |  | |
 | 45 | + | |
45 | 46 |  | |
46 | 47 |  | |
47 | 48 |  | |
 | |||
56 | 57 |  | |
57 | 58 |  | |
58 | 59 |  | |
59 |  | - | |
60 |  | - | |
 | 60 | + | |
 | 61 | + | |
61 | 62 |  | |
62 | 63 |  | |
63 | 64 |  | |
 | |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
 | |||
6 | 6 |  | |
7 | 7 |  | |
8 | 8 |  | |
9 |  | - | |
10 | 9 |  | |
 | 10 | + | |
11 | 11 |  | |
12 | 12 |  | |
13 | 13 |  | |
 | |||
Lines changed: 4 additions & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
 | |||
33 | 33 |  | |
34 | 34 |  | |
35 | 35 |  | |
36 |  | - | |
37 | 36 |  | |
 | 37 | + | |
38 | 38 |  | |
39 | 39 |  | |
40 | 40 |  | |
 | |||
163 | 163 |  | |
164 | 164 |  | |
165 | 165 |  | |
166 |  | - | |
 | 166 | + | |
167 | 167 |  | |
168 | 168 |  | |
169 | 169 |  | |
 | |||
272 | 272 |  | |
273 | 273 |  | |
274 | 274 |  | |
275 |  | - | |
 | 275 | + | |
276 | 276 |  | |
277 | 277 |  | |
278 | 278 |  | |
 | |||
414 | 414 |  | |
415 | 415 |  | |
416 | 416 |  | |
417 |  | - | |
 | 417 | + | |
418 | 418 |  | |
419 | 419 |  | |
420 | 420 |  | |
 | |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
 | |||
11 | 11 |  | |
12 | 12 |  | |
13 | 13 |  | |
14 |  | - | |
15 | 14 |  | |
 | 15 | + | |
16 | 16 |  | |
17 | 17 |  | |
18 | 18 |  | |
 | |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
 | |||
104 | 104 |  | |
105 | 105 |  | |
106 | 106 |  | |
107 |  | - | |
 | 107 | + | |
108 | 108 |  | |
109 | 109 |  | |
110 | 110 |  | |
 | |||
Lines changed: 2 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
 | |||
16 | 16 |  | |
17 | 17 |  | |
18 | 18 |  | |
19 |  | - | |
20 | 19 |  | |
 | 20 | + | |
21 | 21 |  | |
22 | 22 |  | |
23 | 23 |  | |
 | |||
185 | 185 |  | |
186 | 186 |  | |
187 | 187 |  | |
188 |  | - | |
 | 188 | + | |
189 | 189 |  | |
190 | 190 |  | |
191 | 191 |  | |
 | |||
Lines changed: 3 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
 | |||
10 | 10 |  | |
11 | 11 |  | |
12 | 12 |  | |
 | 13 | + | |
13 | 14 |  | |
14 | 15 |  | |
15 | 16 |  | |
 | |||
55 | 56 |  | |
56 | 57 |  | |
57 | 58 |  | |
58 |  | - | |
 | 59 | + | |
59 | 60 |  | |
60 | 61 |  | |
61 | 62 |  | |
 | |||
65 | 66 |  | |
66 | 67 |  | |
67 | 68 |  | |
68 |  | - | |
 | 69 | + | |
69 | 70 |  | |
70 | 71 |  | |
71 | 72 |  | |
 | |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
 | |||
60 | 60 |  | |
61 | 61 |  | |
62 | 62 |  | |
63 |  | - | |
 | 63 | + | |
64 | 64 |  | |
65 | 65 |  | |
66 | 66 |  | |
 | |||
0 commit comments