Skip to content

Commit bd544ab

Browse files
mczphmczph
committed
1.58
1 parent 271c8eb commit bd544ab

File tree

19 files changed

+740
-102
lines changed

19 files changed

+740
-102
lines changed

‎config/immersiveengineering.cfg‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -738,3 +738,4 @@ general {
738738

739739
}
740740

741+

‎config/justenoughmagiculture.cfg‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -504,6 +504,18 @@ general {
504504

505505
}
506506

507+
##########################################################################################################
508+
# just_enough_items
509+
#--------------------------------------------------------------------------------------------------------#
510+
# JEM Grimoire of Gaia 3 Just Enough Items settings.
511+
##########################################################################################################
512+
513+
just_enough_items {
514+
# Adds the Grimiore of Gaia loot boxes to the Loot Bag category. This is used to fix the otherwise
515+
# hardcoded loot table for GoG's built-in category.
516+
B:enableJEILootBags=true
517+
}
518+
507519
}
508520

509521
##########################################################################################################

‎config/modularmachinery/machinery/melter.json‎

Lines changed: 359 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,359 @@
1+
{
2+
"registryname": "melter",
3+
"localizedname": "ia.machine.melter.name",
4+
"requires-blueprint": false,
5+
"color": "80372b",
6+
"parts": [
7+
{
8+
"x": -1,
9+
"y": 0,
10+
"z": 3,
11+
"elements": [
12+
"tconstruct:seared_glass@0"
13+
]
14+
},
15+
{
16+
"x": 1,
17+
"y": 0,
18+
"z": 4,
19+
"elements": [
20+
"immersiveengineering:sheetmetal@6"
21+
]
22+
},
23+
{
24+
"x": -1,
25+
"y": 0,
26+
"z": 2,
27+
"elements": [
28+
"tconstruct:seared_glass@0"
29+
]
30+
},
31+
{
32+
"x": 1,
33+
"y": 0,
34+
"z": 3,
35+
"elements": [
36+
"tconstruct:seared_glass@0"
37+
]
38+
},
39+
{
40+
"x": -1,
41+
"y": 0,
42+
"z": 1,
43+
"elements": [
44+
"tconstruct:seared_glass@0"
45+
]
46+
},
47+
{
48+
"x": 1,
49+
"y": 0,
50+
"z": 2,
51+
"elements": [
52+
"tconstruct:seared_glass@0"
53+
]
54+
},
55+
{
56+
"x": -1,
57+
"y": 0,
58+
"z": 0,
59+
"elements": [
60+
"modularmachinery:blockmefluidoutputbus@0"
61+
]
62+
},
63+
{
64+
"x": 1,
65+
"y": 0,
66+
"z": 1,
67+
"elements": [
68+
"tconstruct:seared_glass@0"
69+
]
70+
},
71+
{
72+
"x": 1,
73+
"y": 0,
74+
"z": 0,
75+
"elements": [
76+
"modularmachinery:blockmeiteminputbus@0"
77+
]
78+
},
79+
{
80+
"x": -1,
81+
"y": 0,
82+
"z": 4,
83+
"elements": [
84+
"immersiveengineering:sheetmetal@6"
85+
]
86+
},
87+
{
88+
"x": 1,
89+
"y": 1,
90+
"z": 0,
91+
"elements": [
92+
"immersiveengineering:sheetmetal@6"
93+
]
94+
},
95+
{
96+
"x": 1,
97+
"y": 1,
98+
"z": 4,
99+
"elements": [
100+
"immersiveengineering:sheetmetal@6"
101+
]
102+
},
103+
{
104+
"x": 1,
105+
"y": 1,
106+
"z": 3,
107+
"elements": [
108+
"immersiveengineering:sheetmetal@6"
109+
]
110+
},
111+
{
112+
"x": 1,
113+
"y": 1,
114+
"z": 2,
115+
"elements": [
116+
"immersiveengineering:sheetmetal@6"
117+
]
118+
},
119+
{
120+
"x": 1,
121+
"y": 1,
122+
"z": 1,
123+
"elements": [
124+
"immersiveengineering:sheetmetal@6"
125+
]
126+
},
127+
{
128+
"x": -1,
129+
"y": -1,
130+
"z": 1,
131+
"elements": [
132+
"immersiveengineering:sheetmetal@6"
133+
]
134+
},
135+
{
136+
"x": -1,
137+
"y": -1,
138+
"z": 2,
139+
"elements": [
140+
"immersiveengineering:sheetmetal@6"
141+
]
142+
},
143+
{
144+
"x": -1,
145+
"y": 1,
146+
"z": 4,
147+
"elements": [
148+
"immersiveengineering:sheetmetal@6"
149+
]
150+
},
151+
{
152+
"x": -1,
153+
"y": -1,
154+
"z": 3,
155+
"elements": [
156+
"immersiveengineering:sheetmetal@6"
157+
]
158+
},
159+
{
160+
"x": -1,
161+
"y": -1,
162+
"z": 4,
163+
"elements": [
164+
"immersiveengineering:sheetmetal@6"
165+
]
166+
},
167+
{
168+
"x": -1,
169+
"y": 1,
170+
"z": 3,
171+
"elements": [
172+
"immersiveengineering:sheetmetal@6"
173+
]
174+
},
175+
{
176+
"x": -1,
177+
"y": 1,
178+
"z": 2,
179+
"elements": [
180+
"immersiveengineering:sheetmetal@6"
181+
]
182+
},
183+
{
184+
"x": -1,
185+
"y": 1,
186+
"z": 1,
187+
"elements": [
188+
"immersiveengineering:sheetmetal@6"
189+
]
190+
},
191+
{
192+
"x": -1,
193+
"y": 1,
194+
"z": 0,
195+
"elements": [
196+
"immersiveengineering:sheetmetal@6"
197+
]
198+
},
199+
{
200+
"x": -1,
201+
"y": -1,
202+
"z": 0,
203+
"elements": [
204+
"immersiveengineering:sheetmetal@6"
205+
]
206+
},
207+
{
208+
"x": 0,
209+
"y": 0,
210+
"z": 4,
211+
"elements": [
212+
"modularmachinery:blockenergyinputhatch"
213+
]
214+
},
215+
{
216+
"x": 0,
217+
"y": 0,
218+
"z": 3,
219+
"elements": [
220+
"enderio:block_end_iron_bars@0"
221+
]
222+
},
223+
{
224+
"x": 0,
225+
"y": 0,
226+
"z": 2,
227+
"elements": [
228+
"enderio:block_end_iron_bars@0"
229+
]
230+
},
231+
{
232+
"x": 0,
233+
"y": 0,
234+
"z": 1,
235+
"elements": [
236+
"enderio:block_end_iron_bars@0"
237+
]
238+
},
239+
{
240+
"x": 0,
241+
"y": -1,
242+
"z": 1,
243+
"elements": [
244+
"immersiveengineering:sheetmetal@6"
245+
]
246+
},
247+
{
248+
"x": 1,
249+
"y": -1,
250+
"z": 2,
251+
"elements": [
252+
"immersiveengineering:sheetmetal@6"
253+
]
254+
},
255+
{
256+
"x": 1,
257+
"y": -1,
258+
"z": 1,
259+
"elements": [
260+
"immersiveengineering:sheetmetal@6"
261+
]
262+
},
263+
{
264+
"x": 0,
265+
"y": -1,
266+
"z": 0,
267+
"elements": [
268+
"modularmachinery:blockfluidinputhatch"
269+
]
270+
},
271+
{
272+
"x": 1,
273+
"y": -1,
274+
"z": 0,
275+
"elements": [
276+
"immersiveengineering:sheetmetal@6"
277+
]
278+
},
279+
{
280+
"x": 0,
281+
"y": -1,
282+
"z": 3,
283+
"elements": [
284+
"immersiveengineering:sheetmetal@6"
285+
]
286+
},
287+
{
288+
"x": 0,
289+
"y": -1,
290+
"z": 2,
291+
"elements": [
292+
"immersiveengineering:sheetmetal@6"
293+
]
294+
},
295+
{
296+
"x": 0,
297+
"y": -1,
298+
"z": 4,
299+
"elements": [
300+
"immersiveengineering:sheetmetal@6"
301+
]
302+
},
303+
{
304+
"x": 1,
305+
"y": -1,
306+
"z": 4,
307+
"elements": [
308+
"immersiveengineering:sheetmetal@6"
309+
]
310+
},
311+
{
312+
"x": 1,
313+
"y": -1,
314+
"z": 3,
315+
"elements": [
316+
"immersiveengineering:sheetmetal@6"
317+
]
318+
},
319+
{
320+
"x": 0,
321+
"y": 1,
322+
"z": 1,
323+
"elements": [
324+
"tconstruct:seared_glass@0"
325+
]
326+
},
327+
{
328+
"x": 0,
329+
"y": 1,
330+
"z": 0,
331+
"elements": [
332+
"modularmachinery:blockparallelcontroller"
333+
]
334+
},
335+
{
336+
"x": 0,
337+
"y": 1,
338+
"z": 3,
339+
"elements": [
340+
"tconstruct:seared_glass@0"
341+
]
342+
},
343+
{
344+
"x": 0,
345+
"y": 1,
346+
"z": 2,
347+
"elements": [
348+
"tconstruct:seared_glass@0"
349+
]
350+
},
351+
{
352+
"x": 0,
353+
"y": 1,
354+
"z": 4,
355+
"elements": [
356+
"immersiveengineering:sheetmetal@6"
357+
]
358+
}
359+
]}

scripts/logback.log renamed to groovy/assets/interactions/lang/en_us.lang

File renamed without changes.

0 commit comments

Comments
 (0)