Skip to content

Commit 62e4c4a

Browse files
GMugXDGMugXD
committed
Sync main branch with v7.1 build
1 parent 5b8b4e0 commit 62e4c4a

File tree

270 files changed

+1106
-0
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

270 files changed

+1106
-0
lines changed

‎README.md‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,21 @@
11
# The Quantum Realm Mod
22

3+
<<<<<<< HEAD
4+
***Your schemes and saves are prone to corruption. Export your data before updating.***
5+
6+
=======
7+
>>>>>>> origin/v7.1
38
*An extremely large Mindustry mod, solely dedicated for mindustry roleplaying and builds alike.*
49

510
Official mod of the Quantum Realm, and the Chaotican Archives.
611

12+
<<<<<<< HEAD
13+
# QRM v7.1 has been released.
14+
**QRM v7 Changelog**
15+
=======
716
# QRM v7 is out.
817
**Changelog**
18+
>>>>>>> origin/v7.1
919
Added
1020
- Beveled sorters, Highlighted sorters, and Unloader Two chiseled sets
1121
- Way, way more chiseled diagonal variants
@@ -35,3 +45,28 @@ Fixed
3545
- Config nodes having glow
3646
- Unloader two a sorter now
3747
- Revert noise sorter changes, now unlegacy'd
48+
<<<<<<< HEAD
49+
50+
**QRM v7.1 Changelog**
51+
Fixed
52+
- Bezeled chiseled side-line being offset
53+
- Transperant, white, black item source having the wrong name
54+
- Liquid router source not having a texture
55+
- Particle generators not being invisible
56+
- Normal, inverted, highlight, bezel, spectral, source centered corners, diagonal router corner 3 being offset
57+
- Config stuff not being flat
58+
- Sorter gray colour 5 being olive
59+
- Open Item Vial not being able to rotate
60+
- Full liquid vials being able to rotate, even they can't visually
61+
- Books resprite
62+
63+
Added
64+
- Borderless item source (for SFX turrets)
65+
- Flat beveled, highlight sorters
66+
- More books
67+
- Duct router catears
68+
69+
Removed
70+
- Extra surge router slope corner
71+
=======
72+
>>>>>>> origin/v7.1

‎content/blocks/distribution/chiseled/duct-router/zzzzzzz-duct-router-chiseled-62.json‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"type": "Sorter",
3+
"name": "Chiseled Duct Router",
4+
"health": 600,
5+
"size": 1,
6+
"rotate": true,
7+
"alwaysUnlocked": true,
8+
"requirements": [
9+
"copper/2",
10+
"lead/2"
11+
],
12+
"category": "distribution",
13+
"research": {
14+
15+
}
16+
}

‎content/blocks/distribution/chiseled/duct-router/zzzzzzz-duct-router-chiseled-63.json‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"type": "Sorter",
3+
"name": "Chiseled Duct Router",
4+
"health": 600,
5+
"size": 1,
6+
"rotate": true,
7+
"alwaysUnlocked": true,
8+
"requirements": [
9+
"copper/2",
10+
"lead/2"
11+
],
12+
"category": "distribution",
13+
"research": {
14+
15+
}
16+
}

‎content/blocks/distribution/flat/flat-beveled-sorter.json‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"type": "Sorter",
3+
"name": "Flat Beveled Sorter",
4+
"health": 600,
5+
"size": 1,
6+
"alwaysUnlocked": true,
7+
"requirements": [
8+
"copper/2",
9+
"lead/2"
10+
],
11+
"category": "distribution",
12+
"research": {
13+
14+
}
15+
}

‎content/blocks/distribution/flat/flat-highlight-sorter.json‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"type": "Sorter",
3+
"name": "Flat Highlighted Sorter",
4+
"health": 600,
5+
"size": 1,
6+
"alwaysUnlocked": true,
7+
"requirements": [
8+
"copper/2",
9+
"lead/2"
10+
],
11+
"category": "distribution",
12+
"research": {
13+
14+
}
15+
}

‎content/blocks/distribution/invis-source.json‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"type": "ItemSource",
3+
"name": "Borderless Item Source",
4+
"health": 600,
5+
"size": 1,
6+
"alwaysUnlocked": true,
7+
"hasShadow": false,
8+
"requirements": [
9+
"copper/2",
10+
"lead/2"
11+
],
12+
"category": "distribution",
13+
"research": {
14+
15+
}
16+
}

‎content/blocks/distribution/sorter-test.json‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"type": "ItemSource",
3+
"name": "Invisible Item Sorter",
4+
"health": 600,
5+
"size": 1,
6+
"alwaysUnlocked": true,
7+
"hasShadow": false,
8+
"requirements": [
9+
"copper/2",
10+
"lead/2"
11+
],
12+
"category": "distribution",
13+
"research": {
14+
15+
}
16+
}

‎content/blocks/distribution/sources/item-source-black.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
{
22
"type": "ItemSource",
3+
<<<<<<< HEAD
4+
"name": "Black Item Source",
5+
=======
36
"name": "Blue Item Source",
7+
>>>>>>> origin/v7.1
48
"health": 600,
59
"size": 1,
610
"rotate": false,

‎content/blocks/distribution/sources/item-source-transperant.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
{
22
"type": "ItemSource",
3+
<<<<<<< HEAD
4+
"name": "Transperant Item Source",
5+
=======
36
"name": "Blue Item Source",
7+
>>>>>>> origin/v7.1
48
"health": 600,
59
"size": 1,
610
"rotate": false,

‎content/blocks/distribution/sources/item-source-white.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
{
22
"type": "ItemSource",
3+
<<<<<<< HEAD
4+
"name": "White Item Source",
5+
=======
36
"name": "Cyan Item Source",
7+
>>>>>>> origin/v7.1
48
"health": 600,
59
"size": 1,
610
"rotate": false,

0 commit comments

Comments
 (0)