1
   2
   3
   4
   5
   6
   7
   8
   9
  10
  11
  12
  13
  14
  15
  16
  17
  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
  75
  76
  77
  78
  79
  80
  81
  82
  83
  84
  85
  86
  87
  88
  89
  90
  91
  92
  93
  94
  95
  96
  97
  98
  99
 100
 101
 102
 103
 104
 105
 106
 107
 108
 109
 110
 111
 112
 113
 114
 115
 116
 117
 118
 119
 120
 121
 122
 123
 124
 125
 126
 127
 128
 129
 130
 131
 132
 133
 134
 135
 136
 137
 138
 139
 140
 141
 142
 143
 144
 145
 146
 147
 148
 149
 150
 151
 152
 153
 154
 155
 156
 157
 158
 159
 160
 161
 162
 163
 164
 165
 166
 167
 168
 169
 170
 171
 172
 173
 174
 175
 176
 177
 178
 179
 180
 181
 182
 183
 184
 185
 186
 187
 188
 189
 190
 191
 192
 193
 194
 195
 196
 197
 198
 199
 200
 201
 202
 203
 204
 205
 206
 207
 208
 209
 210
 211
 212
 213
 214
 215
 216
 217
 218
 219
 220
 221
 222
 223
 224
 225
 226
 227
 228
 229
 230
 231
 232
 233
 234
 235
 236
 237
 238
 239
 240
 241
 242
 243
 244
 245
 246
 247
 248
 249
 250
 251
 252
 253
 254
 255
 256
 257
 258
 259
 260
 261
 262
 263
 264
 265
 266
 267
 268
 269
 270
 271
 272
 273
 274
 275
 276
 277
 278
 279
 280
 281
 282
 283
 284
 285
 286
 287
 288
 289
 290
 291
 292
 293
 294
 295
 296
 297
 298
 299
 300
 301
 302
 303
 304
 305
 306
 307
 308
 309
 310
 311
 312
 313
 314
 315
 316
 317
 318
 319
 320
 321
 322
 323
 324
 325
 326
 327
 328
 329
 330
 331
 332
 333
 334
 335
 336
 337
 338
 339
 340
 341
 342
 343
 344
 345
 346
 347
 348
 349
 350
 351
 352
 353
 354
 355
 356
 357
 358
 359
 360
 361
 362
 363
 364
 365
 366
 367
 368
 369
 370
 371
 372
 373
 374
 375
 376
 377
 378
 379
 380
 381
 382
 383
 384
 385
 386
 387
 388
 389
 390
 391
 392
 393
 394
 395
 396
 397
 398
 399
 400
 401
 402
 403
 404
 405
 406
 407
 408
 409
 410
 411
 412
 413
 414
 415
 416
 417
 418
 419
 420
 421
 422
 423
 424
 425
 426
 427
 428
 429
 430
 431
 432
 433
 434
 435
 436
 437
 438
 439
 440
 441
 442
 443
 444
 445
 446
 447
 448
 449
 450
 451
 452
 453
 454
 455
 456
 457
 458
 459
 460
 461
 462
 463
 464
 465
 466
 467
 468
 469
 470
 471
 472
 473
 474
 475
 476
 477
 478
 479
 480
 481
 482
 483
 484
 485
 486
 487
 488
 489
 490
 491
 492
 493
 494
 495
 496
 497
 498
 499
 500
 501
 502
 503
 504
 505
 506
 507
 508
 509
 510
 511
 512
 513
 514
 515
 516
 517
 518
 519
 520
 521
 522
 523
 524
 525
 526
 527
 528
 529
 530
 531
 532
 533
 534
 535
 536
 537
 538
 539
 540
 541
 542
 543
 544
 545
 546
 547
 548
 549
 550
 551
 552
 553
 554
 555
 556
 557
 558
 559
 560
 561
 562
 563
 564
 565
 566
 567
 568
 569
 570
 571
 572
 573
 574
 575
 576
 577
 578
 579
 580
 581
 582
 583
 584
 585
 586
 587
 588
 589
 590
 591
 592
 593
 594
 595
 596
 597
 598
 599
 600
 601
 602
 603
 604
 605
 606
 607
 608
 609
 610
 611
 612
 613
 614
 615
 616
 617
 618
 619
 620
 621
 622
 623
 624
 625
 626
 627
 628
 629
 630
 631
 632
 633
 634
 635
 636
 637
 638
 639
 640
 641
 642
 643
 644
 645
 646
 647
 648
 649
 650
 651
 652
 653
 654
 655
 656
 657
 658
 659
 660
 661
 662
 663
 664
 665
 666
 667
 668
 669
 670
 671
 672
 673
 674
 675
 676
 677
 678
 679
 680
 681
 682
 683
 684
 685
 686
 687
 688
 689
 690
 691
 692
 693
 694
 695
 696
 697
 698
 699
 700
 701
 702
 703
 704
 705
 706
 707
 708
 709
 710
 711
 712
 713
 714
 715
 716
 717
 718
 719
 720
 721
 722
 723
 724
 725
 726
 727
 728
 729
 730
 731
 732
 733
 734
 735
 736
 737
 738
 739
 740
 741
 742
 743
 744
 745
 746
 747
 748
 749
 750
 751
 752
 753
 754
 755
 756
 757
 758
 759
 760
 761
 762
 763
 764
 765
 766
 767
 768
 769
 770
 771
 772
 773
 774
 775
 776
 777
 778
 779
 780
 781
 782
 783
 784
 785
 786
 787
 788
 789
 790
 791
 792
 793
 794
 795
 796
 797
 798
 799
 800
 801
 802
 803
 804
 805
 806
 807
 808
 809
 810
 811
 812
 813
 814
 815
 816
 817
 818
 819
 820
 821
 822
 823
 824
 825
 826
 827
 828
 829
 830
 831
 832
 833
 834
 835
 836
 837
 838
 839
 840
 841
 842
 843
 844
 845
 846
 847
 848
 849
 850
 851
 852
 853
 854
 855
 856
 857
 858
 859
 860
 861
 862
 863
 864
 865
 866
 867
 868
 869
 870
 871
 872
 873
 874
 875
 876
 877
 878
 879
 880
 881
 882
 883
 884
 885
 886
 887
 888
 889
 890
 891
 892
 893
 894
 895
 896
 897
 898
 899
 900
 901
 902
 903
 904
 905
 906
 907
 908
 909
 910
 911
 912
 913
 914
 915
 916
 917
 918
 919
 920
 921
 922
 923
 924
 925
 926
 927
 928
 929
 930
 931
 932
 933
 934
 935
 936
 937
 938
 939
 940
 941
 942
 943
 944
 945
 946
 947
 948
 949
 950
 951
 952
 953
 954
 955
 956
 957
 958
 959
 960
 961
 962
 963
 964
 965
 966
 967
 968
 969
 970
 971
 972
 973
 974
 975
 976
 977
 978
 979
 980
 981
 982
 983
 984
 985
 986
 987
 988
 989
 990
 991
 992
 993
 994
 995
 996
 997
 998
 999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
1185
1186
1187
1188
1189
1190
1191
1192
1193
1194
1195
1196
1197
1198
1199
1200
1201
1202
1203
1204
1205
1206
1207
1208
1209
1210
1211
1212
1213
1214
1215
1216
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
1232
1233
1234
1235
1236
1237
1238
1239
1240
1241
1242
1243
1244
1245
1246
1247
1248
1249
1250
1251
1252
1253
1254
1255
1256
1257
1258
1259
1260
1261
1262
1263
1264
1265
1266
1267
1268
1269
1270
1271
1272
1273
1274
1275
1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
1290
1291
1292
1293
1294
1295
1296
1297
1298
1299
1300
1301
1302
1303
1304
1305
1306
1307
1308
1309
1310
1311
1312
1313
1314
1315
1316
1317
1318
1319
1320
1321
1322
1323
1324
1325
1326
1327
1328
1329
1330
1331
1332
1333
1334
1335
1336
1337
1338
1339
1340
1341
1342
1343
1344
1345
1346
1347
1348
1349
1350
1351
1352
1353
1354
1355
1356
1357
1358
1359
1360
1361
1362
1363
1364
1365
1366
1367
1368
1369
1370
1371
1372
1373
1374
1375
1376
1377
1378
1379
1380
1381
1382
1383
1384
1385
1386
1387
1388
1389
1390
1391
1392
1393
1394
1395
1396
1397
1398
1399
1400
1401
1402
1403
1404
1405
1406
1407
1408
1409
1410
1411
1412
1413
1414
1415
1416
1417
1418
1419
1420
1421
1422
1423
1424
1425
1426
1427
1428
1429
1430
1431
1432
1433
1434
1435
1436
1437
1438
1439
1440
1441
1442
1443
1444
1445
1446
1447
1448
1449
1450
1451
1452
1453
1454
1455
1456
1457
1458
1459
1460
1461
1462
1463
1464
1465
1466
1467
1468
1469
1470
1471
1472
1473
1474
1475
1476
1477
1478
1479
1480
1481
1482
1483
1484
1485
1486
1487
1488
1489
1490
1491
1492
1493
1494
1495
1496
1497
1498
1499
1500
1501
1502
1503
1504
1505
1506
1507
1508
1509
1510
1511
1512
1513
1514
1515
1516
1517
1518
1519
1520
1521
1522
1523
1524
1525
1526
1527
1528
1529
1530
1531
1532
1533
1534
1535
1536
1537
1538
1539
1540
1541
1542
1543
1544
1545
1546
1547
1548
1549
1550
1551
1552
1553
1554
1555
1556
1557
1558
1559
1560
1561
1562
1563
1564
1565
1566
1567
1568
1569
1570
1571
1572
1573
1574
1575
1576
1577
1578
1579
1580
1581
1582
1583
1584
1585
1586
1587
1588
1589
1590
1591
1592
1593
1594
1595
1596
1597
1598
1599
1600
1601
1602
1603
1604
1605
1606
1607
1608
1609
1610
1611
1612
1613
1614
1615
1616
1617
1618
1619
1620
1621
1622
1623
1624
1625
1626
1627
1628
1629
1630
1631
1632
1633
1634
1635
1636
1637
1638
1639
1640
1641
1642
1643
1644
1645
1646
1647
1648
1649
1650
1651
1652
1653
1654
1655
1656
1657
1658
1659
1660
1661
1662
1663
1664
1665
1666
1667
1668
1669
1670
1671
1672
1673
1674
1675
1676
1677
1678
1679
1680
1681
1682
1683
1684
1685
1686
1687
1688
1689
1690
1691
1692
1693
1694
1695
1696
1697
1698
1699
1700
1701
1702
1703
1704
1705
1706
1707
1708
1709
1710
1711
1712
1713
1714
1715
1716
1717
1718
1719
1720
1721
1722
1723
1724
1725
1726
1727
1728
1729
1730
1731
1732
1733
1734
1735
1736
1737
1738
1739
1740
1741
1742
1743
1744
1745
1746
1747
1748
1749
1750
1751
1752
1753
1754
1755
1756
1757
1758
1759
1760
1761
1762
1763
1764
1765
1766
1767
1768
1769
1770
1771
1772
1773
1774
1775
1776
1777
1778
1779
1780
1781
1782
1783
1784
1785
1786
1787
1788
1789
1790
1791
1792
1793
1794
1795
1796
1797
1798
1799
1800
1801
1802
1803
1804
1805
1806
1807
1808
1809
1810
1811
1812
1813
1814
1815
1816
1817
1818
1819
1820
1821
1822
1823
1824
1825
1826
1827
1828
1829
1830
1831
1832
1833
1834
1835
1836
1837
1838
1839
1840
1841
1842
1843
1844
1845
1846
1847
1848
1849
1850
1851
1852
1853
1854
1855
1856
1857
1858
1859
1860
1861
1862
1863
1864
1865
1866
1867
1868
1869
1870
1871
1872
1873
1874
1875
1876
1877
1878
1879
1880
1881
1882
1883
1884
1885
1886
1887
1888
1889
1890
1891
1892
1893
1894
1895
1896
1897
1898
1899
1900
1901
1902
1903
1904
1905
1906
1907
1908
1909
1910
1911
1912
1913
1914
1915
1916
1917
1918
1919
1920
1921
1922
1923
1924
1925
1926
1927
1928
1929
1930
1931
1932
1933
1934
1935
1936
1937
1938
1939
1940
1941
1942
1943
1944
1945
1946
1947
1948
1949
1950
1951
1952
1953
1954
1955
1956
1957
1958
1959
1960
1961
1962
1963
1964
1965
1966
1967
1968
1969
1970
1971
1972
1973
1974
1975
1976
1977
1978
1979
1980
1981
1982
1983
1984
1985
1986
1987
1988
1989
1990
1991
1992
1993
1994
1995
1996
1997
1998
1999
2000
2001
2002
2003
2004
2005
2006
2007
2008
2009
2010
2011
2012
2013
2014
2015
2016
2017
2018
2019
2020
2021
2022
2023
2024
2025
2026
2027
2028
2029
2030
2031
2032
2033
2034
2035
2036
2037
2038
2039
2040
2041
2042
2043
2044
2045
2046
2047
2048
2049
2050
2051
2052
2053
2054
2055
2056
2057
2058
2059
2060
2061
2062
2063
2064
2065
2066
2067
2068
2069
2070
2071
2072
2073
2074
2075
2076
2077
2078
2079
2080
2081
2082
2083
2084
2085
2086
2087
2088
2089
2090
2091
2092
2093
2094
2095
2096
2097
2098
2099
2100
2101
2102
2103
2104
2105
2106
2107
2108
2109
2110
2111
2112
2113
2114
2115
2116
2117
2118
2119
2120
2121
2122
2123
2124
2125
2126
2127
2128
2129
2130
2131
2132
2133
2134
2135
2136
2137
2138
2139
2140
2141
2142
2143
2144
2145
2146
2147
2148
2149
2150
2151
2152
2153
2154
2155
2156
2157
2158
2159
2160
2161
2162
2163
2164
2165
2166
2167
2168
2169
2170
2171
2172
2173
2174
2175
2176
2177
2178
2179
2180
2181
2182
2183
2184
2185
2186
2187
2188
2189
2190
2191
2192
2193
2194
2195
2196
2197
2198
2199
2200
2201
2202
2203
2204
2205
2206
2207
2208
2209
2210
2211
2212
2213
2214
2215
2216
2217
2218
2219
2220
2221
2222
2223
2224
2225
2226
2227
2228
2229
2230
2231
2232
2233
2234
2235
2236
2237
2238
2239
2240
2241
2242
2243
2244
2245
2246
2247
2248
2249
2250
2251
2252
2253
2254
2255
2256
2257
2258
2259
2260
2261
2262
2263
2264
2265
2266
2267
2268
2269
2270
2271
2272
2273
2274
2275
2276
2277
2278
2279
2280
2281
2282
2283
2284
2285
2286
2287
2288
2289
2290
2291
2292
 26 files changed, 1199 insertions(+), 282 deletions(-)

diff --git config_180706_1705/Items/crafting/craft_redsteel.txt config_180706_1705/Items/crafting/craft_redsteel.txt
new file mode 100644
index 0000000..907852e
--- /dev/null
+++ config_180706_1705/Items/crafting/craft_redsteel.txt
@@ -0,0 +1,4 @@
+icon: ItemUpgrade_Generic
+id: craft_redsteel
+slot: Quest
+tier: '-1'
diff --git config_180706_1705/Items/laser/laser_snake_3.txt config_180706_1705/Items/laser/laser_snake_3.txt
new file mode 100644
index 0000000..5933044
--- /dev/null
+++ config_180706_1705/Items/laser/laser_snake_3.txt
@@ -0,0 +1,54 @@
+gunMounts:
+- flashOffset: '0.4'
+  gunTypeConfig:
+    bulletHue: purple
+    bulletPalette: all_color
+    bulletPrefab: octagonBullet
+    bulletSize: '2'
+    burst: '1'
+    cooldown: '0'
+    damage: '12.5'
+    isPiercing: 'false'
+    lifetime: '2'
+    multi: '1'
+    multiOffset:
+    - '0'
+    - '0'
+    multiSpread: '0'
+    rof: '7.5'
+    speed: '1.0'
+    spread: '0'
+  mountAngle: '180'
+  mountName: laser_snake_3_mount1
+  sfx:
+    sound: 'null'
+- flashOffset: '0.4'
+  gunTypeConfig:
+    bulletHue: purple
+    bulletPalette: glow
+    bulletPrefab: tracerBullet
+    bulletSize: '0.8160000000000002'
+    burst: '1000'
+    cooldown: '0'
+    damage: '46'
+    isPiercing: 'false'
+    lifetime: '0.125'
+    multi: '2'
+    multiOffset:
+    - '1'
+    - '0'
+    multiSpread: '0'
+    optionDisplay: Laser
+    rof: '10'
+    speed: '48.0'
+    spread: '0'
+  mountName: laser_snake_3_mount2
+  sfx:
+    pitch: '0.5'
+    sound: laser
+    volume: '1'
+icon: ItemLootLaserGun_10
+id: laser_snake_3
+slot: MainGun
+tag: laser
+tier: '10'
diff --git config_180706_1705/Items/laser/laser_snake_3_fire.txt config_180706_1705/Items/laser/laser_snake_3_fire.txt
new file mode 100644
index 0000000..075ba9a
--- /dev/null
+++ config_180706_1705/Items/laser/laser_snake_3_fire.txt
@@ -0,0 +1,59 @@
+gunMounts:
+- flashOffset: '0.4'
+  gunTypeConfig:
+    bulletHue: purple
+    bulletPalette: all_color
+    bulletPrefab: octagonBullet
+    bulletSize: '2'
+    burst: '1'
+    cooldown: '0'
+    damage: '12.5'
+    isPiercing: 'false'
+    lifetime: '2'
+    multi: '1'
+    multiOffset:
+    - '0'
+    - '0'
+    multiSpread: '0'
+    rof: '7.5'
+    speed: '1.0'
+    spread: '0'
+  mountAngle: '180'
+  mountName: laser_snake_3_fire_mount1
+  sfx:
+    sound: 'null'
+- flashOffset: '0.4'
+  gunTypeConfig:
+    bulletHue: red
+    bulletPalette: glow
+    bulletPrefab: fireBullet
+    bulletSize: '0.8160000000000002'
+    burst: '1000'
+    cooldown: '0'
+    damage: '46'
+    effect: Burn
+    effectAmount: '0.1'
+    effectDamage: '3.075'
+    effectTime: '0.1'
+    isPiercing: 'false'
+    lifetime: '3'
+    multi: '3'
+    multiOffset:
+    - '0'
+    - '0'
+    multiSpeed: '1'
+    multiSpread: '0'
+    optionDisplay: Laser
+    rof: '5'
+    speed: '3.0'
+    spread: '10'
+  mountName: laser_snake_3_fire_mount2
+  sfx:
+    pitch: '0.5'
+    sound: laser
+    volume: '1'
+icon: ItemLootLaserGun_10
+id: laser_snake_3_fire
+slot: MainGun
+tag: laser
+tier: '10'
diff --git config_180706_1705/Items/machinegun/machinegun_blizzard.txt config_180706_1705/Items/machinegun/machinegun_blizzard.txt
new file mode 100644
index 0000000..66845e7
--- /dev/null
+++ config_180706_1705/Items/machinegun/machinegun_blizzard.txt
@@ -0,0 +1,78 @@
+gunMounts:
+- flashOffset: '-1'
+  gunTypeConfig:
+    bulletHue: purple
+    bulletPalette: ringing_white
+    bulletPrefab: freezeBullet
+    bulletSize: '0.4'
+    burst: '10'
+    cooldown: '0'
+    damage: '0.125'
+    doesReloadNonemptyClips: 'true'
+    effect: Slow
+    effectAmount: '0.1'
+    effectDamage: '11.25'
+    effectTime: '0.1'
+    isPiercing: 'true'
+    lifetime: '1'
+    multi: '1'
+    multiOffset:
+    - '0'
+    - '0'
+    multiSpread: '0'
+    name: machinegun_blizzard_3_1
+    rof: '10'
+    speed: '10.0'
+    spread: '20'
+    turn: '10'
+  mountName: machinegun_blizzard_3_mount1
+  offset:
+  - '0'
+  - '0'
+  sfx:
+    pitch: '2'
+    sound: machinegun
+    soundMinInterval:
+    - '0.02'
+    - '0.05'
+- flashOffset: '-1'
+  gunTypeConfig:
+    bulletHue: purple
+    bulletPalette: ringing_white
+    bulletPrefab: freezeBullet
+    bulletSize: '0.4'
+    burst: '10'
+    cooldown: '0'
+    damage: '0.125'
+    doesReloadNonemptyClips: 'true'
+    effect: Slow
+    effectAmount: '0.1'
+    effectDamage: '11.25'
+    effectTime: '0.1'
+    isPiercing: 'true'
+    lifetime: '1'
+    multi: '1'
+    multiOffset:
+    - '0'
+    - '0'
+    multiSpread: '0'
+    name: machinegun_blizzard_3_2
+    rof: '10'
+    speed: '10.0'
+    spread: '20'
+    turn: '-10'
+  mountName: machinegun_blizzard_3_mount2
+  offset:
+  - '0'
+  - '0'
+  sfx:
+    pitch: '2'
+    sound: machinegun
+    soundMinInterval:
+    - '0.02'
+    - '0.05'
+icon: ItemLootGun_UltraRare
+id: machinegun_blizzard
+slot: MainGun
+tag: machinegun
+tier: '50'
diff --git config_180706_1705/Items/shotgun/shotgun_doomsday_3.txt config_180706_1705/Items/shotgun/shotgun_doomsday_3.txt
new file mode 100644
index 0000000..fac4083
--- /dev/null
+++ config_180706_1705/Items/shotgun/shotgun_doomsday_3.txt
@@ -0,0 +1,59 @@
+gunMounts:
+- flashOffset: '0.4'
+  gunTypeConfig:
+    bulletHue: purple
+    bulletPalette: ringing_white
+    bulletPrefab: bullet
+    bulletSize: '0.19999999999999998'
+    burst: '42'
+    cooldown: '4'
+    damage: '12.9375'
+    doesReloadNonemptyClips: 'true'
+    effect: Slow
+    effectAmount: '0.1'
+    effectDamage: '4.3125'
+    effectTime: '0.1'
+    isPiercing: 'false'
+    lifetime: '1.4'
+    multi: '6'
+    multiSpread: '6'
+    name: shotgun_doomsday_1
+    rof: '3'
+    speed: '5'
+    spread: '0'
+  mountAngle: '90'
+  mountName: shotgun_doomsday_mount
+  sfx:
+    pitch: '0.5'
+    sound: shotgun
+- flashOffset: '0.4'
+  gunTypeConfig:
+    bulletHue: purple
+    bulletPalette: ringing_white
+    bulletPrefab: bullet
+    bulletSize: '0.19999999999999998'
+    burst: '42'
+    cooldown: '4'
+    damage: '12.9375'
+    doesReloadNonemptyClips: 'true'
+    effect: Slow
+    effectAmount: '0.1'
+    effectDamage: '4.3125'
+    effectTime: '0.1'
+    isPiercing: 'false'
+    lifetime: '1.4'
+    multi: '6'
+    multiSpread: '6'
+    name: shotgun_doomsday_1
+    rof: '3'
+    speed: '5'
+    spread: '0'
+  mountAngle: '-90'
+  mountName: shotgun_doomsday_mount2
+  sfx:
+    sound: 'null'
+icon: ItemLootGun_UltraRare
+id: shotgun_doomsday_3
+slot: MainGun
+tag: shotgun
+tier: '100'
diff --git config_180706_1705/Items/strike/strike_beam_3.txt config_180706_1705/Items/strike/strike_beam_3.txt
new file mode 100644
index 0000000..36a3bb8
--- /dev/null
+++ config_180706_1705/Items/strike/strike_beam_3.txt
@@ -0,0 +1,168 @@
+gunMounts:
+- fireMode: Sprinkler
+  firingArc: '180'
+  flashOffset: '2'
+  gunTypeConfig:
+    bulletHue: purple
+    bulletPalette: glow
+    bulletPrefab: superlonglightningBullet
+    bulletSize: '0.2'
+    burst: '24000'
+    cooldown: '0'
+    damage: '19.8'
+    lifetime: '0.15'
+    multi: '1'
+    multiSpread: '120'
+    name: strike_beam_3_1
+    rof: '8'
+    speed: '0'
+    spread: '0'
+  mountAngle: '0'
+  mountName: strike_beam_3_mount1
+  sfx:
+    sound: Laser Loop
+  slewRate: '180'
+  sprinklerFlyback: 'false'
+  sprinklerIncrementAngle: '-8'
+  sprinklerStartAngle: '0'
+  sprinklerTurnbackAngle: '-8000'
+- fireMode: Sprinkler
+  firingArc: '180'
+  flashOffset: '2'
+  gunTypeConfig:
+    bulletHue: purple
+    bulletPalette: glow
+    bulletPrefab: superlonglightningBullet
+    bulletSize: '0.2'
+    burst: '24000'
+    cooldown: '0'
+    damage: '19.8'
+    lifetime: '0.15'
+    multi: '1'
+    multiSpread: '120'
+    name: strike_beam_3_2
+    rof: '8'
+    speed: '0'
+    spread: '0'
+  mountAngle: '0'
+  mountName: strike_beam_3_mount2
+  sfx:
+    sound: 'null'
+  slewRate: '180'
+  sprinklerFlyback: 'false'
+  sprinklerIncrementAngle: '-4'
+  sprinklerStartAngle: '0'
+  sprinklerTurnbackAngle: '-8000'
+- fireMode: Sprinkler
+  firingArc: '180'
+  flashOffset: '2'
+  gunTypeConfig:
+    bulletHue: purple
+    bulletPalette: glow
+    bulletPrefab: superlonglightningBullet
+    bulletSize: '0.2'
+    burst: '24000'
+    cooldown: '0'
+    damage: '19.8'
+    lifetime: '0.15'
+    multi: '1'
+    multiSpread: '120'
+    name: strike_beam_3_3
+    rof: '8'
+    speed: '0'
+    spread: '0'
+  mountAngle: '0'
+  mountName: strike_beam_3_mount3
+  sfx:
+    sound: 'null'
+  slewRate: '180'
+  sprinklerFlyback: 'false'
+  sprinklerIncrementAngle: '8'
+  sprinklerStartAngle: '0'
+  sprinklerTurnbackAngle: '8000'
+- fireMode: Sprinkler
+  firingArc: '180'
+  flashOffset: '2'
+  gunTypeConfig:
+    bulletHue: purple
+    bulletPalette: glow
+    bulletPrefab: superlonglightningBullet
+    bulletSize: '0.2'
+    burst: '24000'
+    cooldown: '0'
+    damage: '19.8'
+    lifetime: '0.15'
+    multi: '1'
+    multiSpread: '120'
+    name: strike_beam_3_4
+    rof: '8'
+    speed: '0'
+    spread: '0'
+  mountAngle: '0'
+  mountName: strike_beam_3_mount4
+  sfx:
+    sound: 'null'
+  slewRate: '180'
+  sprinklerFlyback: 'false'
+  sprinklerIncrementAngle: '4'
+  sprinklerStartAngle: '0'
+  sprinklerTurnbackAngle: '8000'
+- fireMode: Sprinkler
+  firingArc: '180'
+  flashOffset: '2'
+  gunTypeConfig:
+    bulletHue: purple
+    bulletPalette: glow
+    bulletPrefab: superlonglightningBullet
+    bulletSize: '0.2'
+    burst: '24000'
+    cooldown: '0'
+    damage: '19.8'
+    lifetime: '0.15'
+    multi: '1'
+    multiSpread: '120'
+    name: strike_beam_3_5
+    rof: '8'
+    speed: '0'
+    spread: '0'
+  mountAngle: '0'
+  mountName: strike_beam_3_mount5
+  sfx:
+    sound: 'null'
+  slewRate: '180'
+  sprinklerFlyback: 'false'
+  sprinklerIncrementAngle: '-12'
+  sprinklerStartAngle: '0'
+  sprinklerTurnbackAngle: '-8000'
+- fireMode: Sprinkler
+  firingArc: '180'
+  flashOffset: '2'
+  gunTypeConfig:
+    bulletHue: purple
+    bulletPalette: glow
+    bulletPrefab: superlonglightningBullet
+    bulletSize: '0.2'
+    burst: '24000'
+    cooldown: '0'
+    damage: '19.8'
+    lifetime: '0.15'
+    multi: '1'
+    multiSpread: '120'
+    name: strike_beam_3_6
+    rof: '8'
+    speed: '0'
+    spread: '0'
+  mountAngle: '0'
+  mountName: strike_beam_3_mount6
+  sfx:
+    sound: 'null'
+  slewRate: '180'
+  sprinklerFlyback: 'false'
+  sprinklerIncrementAngle: '12'
+  sprinklerStartAngle: '0'
+  sprinklerTurnbackAngle: '8000'
+icon: ItemLootGun_UltraRare
+id: strike_beam_3
+slot: MainGun
+tag: strike
+tier: '100'
diff --git config_180706_1705/Items/strike/strike_viper_3.txt config_180706_1705/Items/strike/strike_viper_3.txt
new file mode 100644
index 0000000..c23a388
--- /dev/null
+++ config_180706_1705/Items/strike/strike_viper_3.txt
@@ -0,0 +1,103 @@
+actions:
+- gunMount:
+    flashOffset: '0.4'
+    gunTypeConfig:
+      bulletHue: purple
+      bulletPalette: all_color
+      bulletPrefab: leisurelyBullet
+      bulletSize: '0.6800000000000002'
+      burst: '7'
+      cooldown: '1'
+      damage: '7'
+      doesReloadNonemptyClips: 'true'
+      guaranteedHitArcA: '-30'
+      guaranteedHitArcB: '30'
+      guaranteedHitMaxRange: '6.75'
+      guaranteedHitMinRange: '4.2'
+      guaranteedHitMode: Lock
+      lifetime: '2'
+      rof: '20'
+      speed: '6'
+    mountAngle: '120'
+    offset:
+    - '-0.3'
+    - '0'
+    sfx:
+      sound: laser
+- gunMount:
+    flashOffset: '0.4'
+    gunTypeConfig:
+      bulletHue: purple
+      bulletPalette: all_color
+      bulletPrefab: leisurelyBullet
+      bulletSize: '0.6800000000000002'
+      burst: '7'
+      cooldown: '1'
+      damage: '7'
+      doesReloadNonemptyClips: 'true'
+      guaranteedHitArcA: '-30'
+      guaranteedHitArcB: '30'
+      guaranteedHitMaxRange: '6.75'
+      guaranteedHitMinRange: '4.2'
+      guaranteedHitMode: Lock
+      lifetime: '2'
+      rof: '20'
+      speed: '6'
+    mountAngle: '-120'
+    offset:
+    - '0.3'
+    - '0'
+    sfx:
+      sound: 'null'
+- gunMount:
+    flashOffset: '0.4'
+    gunTypeConfig:
+      bulletHue: purple
+      bulletPalette: all_color
+      bulletPrefab: leisurelyBullet
+      bulletSize: '0.6800000000000002'
+      burst: '7'
+      cooldown: '10000000000000'
+      damage: '7'
+      doesReloadNonemptyClips: 'true'
+      guaranteedHitArcA: '-30'
+      guaranteedHitArcB: '30'
+      guaranteedHitMaxRange: '6.75'
+      guaranteedHitMinRange: '4.2'
+      guaranteedHitMode: Lock
+      lifetime: '2'
+      rof: '20'
+      speed: '6'
+    mountAngle: '0'
+    offset:
+    - '-0.3'
+    - '0'
+    sfx:
+      sound: 'null'
+- gunMount:
+    flashOffset: '0.4'
+    gunTypeConfig:
+      bulletHue: purple
+      bulletPalette: ringing_white
+      bulletPrefab: invisibleBullet
+      bulletSize: '0.4'
+      burst: '1'
+      cooldown: '3'
+      damage: '0'
+      doesReloadNonemptyClips: 'true'
+      lifetime: '0.3'
+      multi: '1'
+      rof: '8'
+      speed: '0'
+      spread: '0'
+      statefulEffectOnHeld: lockOnCrosshair
+    offset:
+    - '0'
+    - '3'
+    sfx:
+      sound: 'null'
+icon: ItemLootStrike_10
+id: strike_viper_3
+slot: MainGun
+tag: strike
+tier: '100'
diff --git config_180702_1804/Items/variant/unlock_playerclass_assault_camo.txt config_180702_1804/Items/variant/unlock_playerclass_assault_camo.txt
deleted file mode 100644
index 15c169a..0000000
diff --git config_180702_1804/Items/variant/unlock_playerclass_medic_camo.txt config_180702_1804/Items/variant/unlock_playerclass_medic_camo.txt
deleted file mode 100644
index 65b74c3..0000000
diff --git config_180702_1804/Items/variant/unlock_playerclass_oldfaithful_camo.txt config_180702_1804/Items/variant/unlock_playerclass_oldfaithful_camo.txt
deleted file mode 100644
index fffd33d..0000000
diff --git config_180706_1705/Items/wasp/wasp_kaiju_3.txt config_180706_1705/Items/wasp/wasp_kaiju_3.txt
new file mode 100644
index 0000000..ecc097b
--- /dev/null
+++ config_180706_1705/Items/wasp/wasp_kaiju_3.txt
@@ -0,0 +1,60 @@
+gunMounts:
+- fireMode: Sprinkler
+  firingArc: '180'
+  flashOffset: '2'
+  gunTypeConfig:
+    bulletHue: purple
+    bulletPalette: all_color
+    bulletPrefab: ringBullet
+    bulletSize: '2'
+    burst: '24000'
+    cooldown: '0'
+    damage: '19.8'
+    lifetime: '0.11'
+    multi: '3'
+    multiSpread: '120'
+    name: wasp_kaiju_3_1
+    rof: '10'
+    speed: '0'
+    spread: '0'
+  mountAngle: '0'
+  mountName: wasp_kaiju_3_mount1
+  sfx:
+    sound: Laser Loop
+  slewRate: '180'
+  sprinklerFlyback: 'false'
+  sprinklerIncrementAngle: '0'
+  sprinklerStartAngle: '0'
+  sprinklerTurnbackAngle: '-8000'
+- fireMode: Sprinkler
+  firingArc: '180'
+  flashOffset: '3'
+  gunTypeConfig:
+    bulletHue: purple
+    bulletPalette: all_color
+    bulletPrefab: ringBullet
+    bulletSize: '1.5'
+    burst: '24000'
+    cooldown: '0'
+    damage: '19.8'
+    lifetime: '0.11'
+    multi: '3'
+    multiSpread: '120'
+    name: wasp_kaiju_3_2
+    rof: '10'
+    speed: '0'
+    spread: '0'
+  mountAngle: '0'
+  mountName: wasp_kaiju_3_mount2
+  sfx:
+    sound: 'null'
+  slewRate: '180'
+  sprinklerFlyback: 'false'
+  sprinklerIncrementAngle: '-2'
+  sprinklerStartAngle: '0'
+  sprinklerTurnbackAngle: '-8000'
+icon: ItemLootGun_UltraRare
+id: wasp_kaiju_3
+slot: MainGun
+tag: triple
+tier: '100'
diff --git config_180702_1804/Quests/quests_test.txt config_180706_1705/Quests/quests_test.txt
index eb61afa..2b858e6 100644
--- config_180702_1804/Quests/quests_test.txt
+++ config_180706_1705/Quests/quests_test.txt
@@ -150,5 +150,39 @@
   requirements:
     isAdmin: 'true'
   source: trigger
   tier: '10'
   timeLimit: 00:15
+- completeAtGiver: crafter
+  goals:
+  - items:
+    - id: quest_ambergris
+    target: '50'
+    type: collect
+  id: test_crafting
+  permanent: 'true'
+  replayConfig: immediate
+  replayInstance: immediate
+  requirements:
+    isAdmin: 'true'
+  rewardTier: '8'
+  source: giver
+  tier: '-1'
+  type: crafting
+- completeAtGiver: crafter
+  goals:
+  - items:
+    - id: craft_redsteel
+    target: '3'
+    type: collect
+  id: craft_laser_fire
+  permanent: 'true'
+  replayConfig: immediate
+  replayInstance: immediate
+  requirements:
+    events:
+    - event_biweekly_week1_monday
+    isAdmin: 'true'
+  rewardTier: '8'
+  source: giver
+  tier: '-1'
+  type: crafting
diff --git config_180702_1804/Texts/en-US/events.txt config_180706_1705/Texts/en-US/events.txt
index 1290ec2..fe2facd 100644
--- config_180702_1804/Texts/en-US/events.txt
+++ config_180706_1705/Texts/en-US/events.txt
@@ -1,90 +1,109 @@
 event_daily_friday:
-  description: "Every Friday, the feline nobles spend leisure time with their families. It is a time of pleasant excess. \n\nRodent worshippers of the state religion are barbequed in succulent sauces and the servant dogs are made to dance.\n\n<b><size=18><color=ffffffff>Special Rewards</color></size></b>\n - Superior salvage in noble estates\n - Double XP in noble estates\n\n<b><size=18><color=ffffffff>Schedule</color></size></b>\n{0}- Start: {1}\n - End: {2}\n"
+  description: "Every Friday, the feline nobles spend leisure time with their families. It is a time of pleasant excess. \n\nRodent worshippers of the state religion are barbequed in succulent sauces and the servant dogs are made to dance.\n\n<b><size=18><color=ffffffff>Special Rewards</color></size></b>\n - Superior salvage in noble estates\n - Double XP in noble estates\n\n<b><size=18><color=ffffffff>Schedule</color></size></b>\n{0}{1}\n"
   ending_server_message: Enemy activity in the noble estates returning to normal.
-  header_image: example_header_image
+  header_image: EventHeader_NobleEstates
   starting_server_message: Enemy activity is surging in noble estates. Bonus XP and superior salvage.
   title: Friday Nobility
 event_daily_monday:
-  description: "Every Monday, Northern missions to icey locales gain a major experience bonus.\n\n<b><size=18><color=ffffffff>Special Rewards</color></size></b>\n - Superior salvage on ice missions\n - Double XP on all ice missions\n\n<b><size=18><color=ffffffff>Schedule</color></size></b>\n{0}- Start: {1}\n - End: {2}\n"
+  description: "Every Monday, Northern missions to icey locales gain a major experience bonus.\n\n<b><size=18><color=ffffffff>Special Rewards</color></size></b>\n - Superior salvage on ice missions\n - Double XP on all ice missions\n\n<b><size=18><color=ffffffff>Schedule</color></size></b>\n{0}{1}\n"
   ending_server_message: The icy winds of the north cease their howling.
-  header_image: example_header_image
+  header_image: EventHeader_Ice
   starting_server_message: The icy winds of the north are rising. Seek out the snowy monastery for fine treasures
   title: Monday Chill
 event_daily_saturday:
-  description: "Every Saturday, the nobles and their lackies pay service to the Great Leader. They offer their tithing and supply reports on how much they have extracted from their territories. All that is expected is absolute obedience.\n\n<b><size=18><color=ffffffff>Special Rewards</color></size></b>\n - Superior salvage in Imperial Capital\n - Double XP in Imperial Capital\n\n<b><size=18><color=ffffffff>Schedule</color></size></b>\n{0}- Start: {1}\n - End: {2}\n"
+  description: "Every Saturday, the nobles and their lackies pay service to the Great Leader. They offer their tithing and supply reports on how much they have extracted from their territories. All that is expected is absolute obedience.\n\n<b><size=18><color=ffffffff>Special Rewards</color></size></b>\n - Superior salvage in Imperial Capital\n - Double XP in Imperial Capital\n\n<b><size=18><color=ffffffff>Schedule</color></size></b>\n{0}{1}\n"
   ending_server_message: Enemy activity in the Imperial Capital returning to normal.
-  header_image: example_header_image
+  header_image: EventHeader_ImperialCapital
   starting_server_message: Enemy activity is surging Imperial Capital. Bonus XP and superior salvage.
   title: Saturday Worship
 event_daily_sunday:
-  description: "Every Sunday, the robotic factories start shipping out their production from the previous week. Smart rebels use this opportunity to stock up.\n\n<b><size=18><color=ffffffff>Special Rewards</color></size></b>\n - Superior salvage in robo-factory\n - Double XP in robo-factory\n\n<b><size=18><color=ffffffff>Schedule</color></size></b>\n{0}- Start: {1}\n - End: {2}\n"
+  description: "Every Sunday, the robotic factories start shipping out their production from the previous week. Smart rebels use this opportunity to stock up.\n\n<b><size=18><color=ffffffff>Special Rewards</color></size></b>\n - Superior salvage in robo-factory\n - Double XP in robo-factory\n\n<b><size=18><color=ffffffff>Schedule</color></size></b>\n{0}{1}\n"
   ending_server_message: Enemy activity in the highlands returning to normal.
-  header_image: example_header_image
+  header_image: EventHeader_RoboFactory
   starting_server_message: Enemy activity is surging in the robo factories of the highlands. Bonus XP and superior salvage.
   title: Sunday Highlands
 event_daily_thursday:
-  description: "Every Thursday, the Imperial Archeologists load their finds onto caravans and ship them back to secure storage.\n\nThe empire sustains itself on this ancient remnants of dead civilizations. We are but their shadow.\n\n<b><size=18><color=ffffffff>Special Rewards</color></size></b>\n - Superior salvage in archeology zone\n - Double XP in archeology zone\n\n<b><size=18><color=ffffffff>Schedule</color></size></b>\n{0}- Start: {1}\n - End: {2}\n"
+  description: "Every Thursday, the Imperial Archeologists load their finds onto caravans and ship them back to secure storage.\n\nThe empire sustains itself on this ancient remnants of dead civilizations. We are but their shadow.\n\n<b><size=18><color=ffffffff>Special Rewards</color></size></b>\n - Superior salvage in archeology zone\n - Double XP in archeology zone\n\n<b><size=18><color=ffffffff>Schedule</color></size></b>\n{0}{1}\n"
   ending_server_message: Enemy activity in the highlands returning to normal.
-  header_image: example_header_image
+  header_image: EventHeader_Archaeology
   starting_server_message: Enemy activity is surging the highlands archaeological digs. Bonus XP and superior salvage.
   title: Thursday Ruins
 event_daily_tuesday:
-  description: "Every Tuesday, the hospital complexes release augmented patients. Save them from a fate worse than death.\n\n<b><size=18><color=ffffffff>Special Rewards</color></size></b>\n - Superior salvage in medical zone\n - Double XP in medical zone\n\n<b><size=18><color=ffffffff>Schedule</color></size></b>\n{0}- Start: {1}\n - End: {2}\n"
+  description: "Every Tuesday, the hospital complexes release augmented patients. Save them from a fate worse than death.\n\n<b><size=18><color=ffffffff>Special Rewards</color></size></b>\n - Superior salvage in medical zone\n - Double XP in medical zone\n\n<b><size=18><color=ffffffff>Schedule</color></size></b>\n{0}{1}\n"
   ending_server_message: Enemy activity in the highlands returning to normal.
-  header_image: example_header_image
+  header_image: EventHeader_Hospital
   starting_server_message: Enemy activity is surging in medical zone in the highlands. Bonus XP and superior salvage.
   title: Tuesday Medicine
 event_daily_wednesday:
-  description: "Every Wednesday, back tunnels under the earth open up into the Imperial Reeducation camps. Earn Bonus XP and Superior salvage\n\n<b><size=18><color=ffffffff>Special Rewards</color></size></b>\n - Superior salvage on fire missions\n - Double XP on all fire missions\n\n<b><size=18><color=ffffffff>Schedule</color></size></b>\n{0}- Start: {1}\n - End: {2}\n"
+  description: "Every Wednesday, back tunnels under the earth open up into the Imperial Reeducation camps. Earn Bonus XP and Superior salvage\n\n<b><size=18><color=ffffffff>Special Rewards</color></size></b>\n - Superior salvage on fire missions\n - Double XP on all fire missions\n\n<b><size=18><color=ffffffff>Schedule</color></size></b>\n{0}{1}\n"
   ending_server_message: The secret paths to the Reeducation camps are closed.
-  header_image: example_header_image
+  header_image: EventHeader_Fire
   starting_server_message: Fresh magma tubes are venting to the surface. Seek out the Reeducation camp for treasure.
   title: Wednesday Brimstone
 friends_event:
-  description: "To kick off the winter season, the Empire is transferring fuel from the poor outer regions into the capital city.\n\nThey've commissioned elite guards around the fuel depots in the lowlands.  And there's rumor of a cruel Noble guarding the main supplies inside the city walls.\n\n<b><size=18><color=ffffffff>Special Rewards</color></size></b>\n - Golden Raptor skin\n - Double XP all day Friday\n\n<b><size=18><color=ffffffff>Schedule</color></size></b>\n{0}- Start: {1}\n - End: {2}\n"
+  description: "To kick off the winter season, the Empire is transferring fuel from the poor outer regions into the capital city.\n\nThey've commissioned elite guards around the fuel depots in the lowlands.  And there's rumor of a cruel Noble guarding the main supplies inside the city walls.\n\n<b><size=18><color=ffffffff>Special Rewards</color></size></b>\n - Golden Raptor skin\n - Double XP all day Friday\n\n<b><size=18><color=ffffffff>Schedule</color></size></b>\n{0}{1}\n"
   ending_server_message: Friends time is over!
-  header_image: example_header_image
+  header_image: EventHeader_Updates
   starting_server_message: Friends can join now!
   title: Friendly Fridays
 news_about_news:
   description: 'That''s right, we''re so proud of this new news feature that we are using it to announce a new news feature.
 
 
     Check back with this UI in the future for more news.
 
     '
-  header_image: example_header_image
+  header_image: EventHeader_Updates
   title: 'News: We Now Have News'
 news_fowl_furculas:
   description: "It’s been an exciting week with the latest 5-day playtest recently coming to an end. The team has been thrilled to see old and new players enjoying the game again, experiencing the new content and systems, and giving some great feedback! If you played in the playtest and have feedback, please send it to us via the Steambirds Alliance Discord or on the feedback forum thread, if you have access. \n"
   header_image: ''
   title: 'News: Fledgeling Fowl Furculas'
 news_quizzical_quails:
   description: "The 5-day playtest starts on June 13th. Ends June 18th, 10AM\n\n- New events and news UI. \n- Reworked boss vulnerable states. \n- Even more new icons. \n- Scrap (free currency) prices on items in the store\n- Usual swath of bug fixes and small improvements.\n\nPlease give us your feedback in the Steambirds Discord channel.\n"
-  header_image: example_header_image
+  header_image: EventHeader_Updates
   title: 'News: June Private Playtest'
 news_reliable_remiges:
   description: 'Updates on changes over the past 2 weeks, new B-roll and a magnificent new logo!
 
     '
-  header_image: example_header_image
+  header_image: EventHeader_Updates
   title: 'News: Rapid Reliable Remiges & Rectrices'
 news_sterling_shrikes:
   description: 'Announcing the upcoming private beta, some beautiful new key art, emotes and a nest of polish and bugfix tasks.
 
     '
-  header_image: example_header_image
+  header_image: EventHeader_Updates
   title: 'News: Superbly Sterling Shrikes'
+news_toucan_tomia:
+  description: 'Weekly update! New sounds and beautiful overlayed music; performance work and other changes.
+
+    '
+  header_image: EventHeader_Updates
+  title: 'News: Thrilling Toucan Tomia'
 playtest_event:
-  description: "To kick off the winter season, the Empire is transferring fuel from the poor outer regions into the capital city.\n\nThey've commissioned elite guards around the fuel depots in the lowlands.  And there's rumor of a cruel Noble guarding the main supplies inside the city walls.\n\n<b><size=18><color=ffffffff>Special Rewards</color></size></b>\n - Golden Raptor skin\n - Double XP all day Friday\n\n<b><size=18><color=ffffffff>Schedule</color></size></b>\n {0}- Start: {1}\n - End: {2}\n"
+  description: "To kick off the winter season, the Empire is transferring fuel from the poor outer regions into the capital city.\n\nThey've commissioned elite guards around the fuel depots in the lowlands.  And there's rumor of a cruel Noble guarding the main supplies inside the city walls.\n\n<b><size=18><color=ffffffff>Special Rewards</color></size></b>\n - Golden Raptor skin\n - Double XP all day Friday\n\n<b><size=18><color=ffffffff>Schedule</color></size></b>\n {0}{1}\n"
   ending_server_message: The playtest is over!
-  header_image: example_header_image
+  header_image: EventHeader_Updates
   starting_server_message: Playtest is starting now!
   title: Pre-Launch Playtest
 test_event:
-  description: "This event is for testing, you should never see it when this feature is done.\n\nStop reading this, to simulate what that would be like.\n\nShhh.\n\n<b><size=18><color=ffffffff>Schedule</color></size></b>\n {0}- Start: {1}\n - End: {2}\n"
+  description: 'This event is for testing, you should never see it when this feature is done.
+
+
+    Stop reading this, to simulate what that would be like.
+
+
+    Shhh.
+
+
+    <b><size=18><color=ffffffff>Schedule</color></size></b>
+
+    {0}{1}
+
+    '
   ending_server_message: 'Test Event Ending Test Event Ending Test Event Ending
 
     Test Event Ending Test Event Ending'
   header_image: ''
   starting_server_message: Test Event Starting Test Event Starting Test Event Starting Test Event Starting Test Event Starting Test Event Starting Test Event Starting Test Event Starting Test Event Starting Test Event Starting
diff --git config_180702_1804/Texts/en-US/item.txt config_180706_1705/Texts/en-US/item.txt
index df3f634..5481986 100644
--- config_180702_1804/Texts/en-US/item.txt
+++ config_180706_1705/Texts/en-US/item.txt
@@ -143,10 +143,13 @@ consumable_steam:
   description: Emergency steam supply. Limited use since it is basically a small explosive that instantly vaporizes water. Starts with 5 charges.
   name: Steam Canister
 consumable_xpboost:
   description: When memorized, the pilot's mind flows with the Great Words. They learn faster. Double XP for 30 minutes. Single use.
   name: Meditation on Experience
+craft_redsteel:
+  description: Material used for crafting a fire weapon.
+  name: Red Steel
 damage_0:
   description: Powers up ally weapons.
   name: Aura of Attack
 damage_1:
   description: Powers up ally weapons.
diff --git config_180702_1804/Texts/en-US/planeclasses.txt config_180706_1705/Texts/en-US/planeclasses.txt
index 0f13072..768f7fd 100644
--- config_180702_1804/Texts/en-US/planeclasses.txt
+++ config_180706_1705/Texts/en-US/planeclasses.txt
@@ -11,13 +11,10 @@ assault:
       flavor: This is what happens when a crew of good old birds with a machine shop discover a pirate's stash of 1835 LeTigre Absinthe. Smashing.
       name: Tusker
     VariantB:
       flavor: The whole Rebel-thing doesn't pay, so many have scavengers jobs on the side. This Mining Assault can burrow deep into the dangerous layers of ruins.
       name: Yewnoda Drill
-    camo:
-      flavor: Felines with their inferior eyesight never see the Bull until it is too late. Photophosphors scavenged from deep cave fungi create the plane's unique colors.
-      name: Quiet Bull
     default:
       flavor: A close combat attacker with a devastating energized charge. Early losses by the Rebellion showed a need for an effective deterrent to the Empire's overwhelming numerical superiority.
       name: Assault
     flames:
       flavor: All pilots know the name Pepper. She takes cash up front and she doesn't do requests. It is flames or nothing.
@@ -62,13 +59,10 @@ medic:
       flavor: A doctor flies a fine line when they dabble in their own medicine. There are fixes that give a bird confidence, agility, a sense of speed. The risks seems worth the greater good; the self treatment justified.
       name: Speed Medic
     VariantB:
       flavor: What good is a dead medic? Balance the risk of saving this one life against the long years ahead where you might save a thousand lives.
       name: Endurance Medic
-    camo:
-      flavor: When the Empire began targeting medics, there were no tribunals left to accuse them of war crimes. So rebel medics resorted to camouflage.
-      name: Line Medic
     default:
       flavor: In the brutal hell of modern war, no pilot is more valued than the war medic. An aerial repair means the difference between narrow victory and fiery failure.
       name: Medic
     flames:
       flavor: The grackle who paints these gives discounts to medics. She'll grumble something, tap her wooden leg and hand back half your cash. The leg is painted with the most beautiful flames.
@@ -101,13 +95,10 @@ olfaithful:
       flavor: The new shiny military upgrade to the Old Faithful airframe. Retooled for production in our remaining factories.
       name: Angel of Faith
     VarientA:
       flavor: The wings on this Old Faithful use an earlier construction method of stretching thin hides over finely carved fir spars. Agile. Flammable.
       name: Spirit of Saint Leonardo
-    camo:
-      flavor: An Old Faithful trainer repurposed as scout. The spiffy camouflage paint helps pilots avoid detection by anti-air
-      name: Secret Angel
     default:
       flavor: Originally intended as a training plane, the Old Faithful was pressed into full service when we lost our northern factories.
       name: Old Faithful
     flames:
       flavor: Crowdown Garage employs a grumpy grackle who only paints planes with bad-ass flames. It is her thing.
diff --git config_180702_1804/Texts/en-US/questGivers.txt config_180706_1705/Texts/en-US/questGivers.txt
index 2bfb39a..1d079c8 100644
--- config_180702_1804/Texts/en-US/questGivers.txt
+++ config_180706_1705/Texts/en-US/questGivers.txt
@@ -1,2 +1,4 @@
+crafter:
+  title: Crafting Hut
 tavern:
   title: Pilot's Pub
diff --git config_180702_1804/Texts/en-US/quests.txt config_180706_1705/Texts/en-US/quests.txt
index dcb7910..c2d6d6b 100644
--- config_180702_1804/Texts/en-US/quests.txt
+++ config_180706_1705/Texts/en-US/quests.txt
@@ -810,10 +810,13 @@ basic_kill_x_506_highmountains_T8_hammerplanet2:
   description: Kill 5 of the designated target!
   title: 'Hunt: Crowd Control'
 basic_kill_x_507_highmountains_T8_hyperdrive:
   description: Kill 5 of the designated target!
   title: 'Hunt: Assassin'
+craft_laser_fire:
+  description: Go find 3 Red Steel to craft a Flame Laser.
+  title: 'Craft: Flame Laser'
 dailyreward_Friday:
   description: Claim your daily reward here!
   title: 'Daily Reward: Friday'
 dailyreward_Monday:
   description: Claim your daily reward here!
@@ -908,10 +911,13 @@ test_basic:
   - sergeant: You've accepted the mission.
   title: Collect Stuff
 test_collect:
   description: Go find and collect some fabled Ambergris for a small reward
   title: Collect Ambergris
+test_crafting:
+  description: Make a nice weapon with... whale blubber... apparently?!
+  title: Test Crafting
 test_dungeon_ice:
   description: Testing dungeon spawning
   title: Test Dungeon Ice
 test_permanent_giver:
   description: Just a test
diff --git config_180702_1804/Texts/en-US/ui.txt config_180706_1705/Texts/en-US/ui.txt
index 851db57..88d9b99 100644
--- config_180702_1804/Texts/en-US/ui.txt
+++ config_180706_1705/Texts/en-US/ui.txt
@@ -464,10 +464,11 @@ options_menu_nexus_list_none: None
 options_menu_off: 'Off'
 options_menu_on: 'On'
 options_menu_outline: Outline
 options_menu_plane_steering_type_override: Plane specific modes
 options_menu_quests: Mission Log
+options_menu_quests_crafting: Crafting Recipes
 options_menu_quit: Exit Game
 options_menu_reset_controls: Reset to Defaults
 options_menu_screenshot_scale: Screenshot Scale
 options_menu_select_pilot_skills: Select Pilot Skills
 options_menu_sfx_volume: Game Volume
@@ -515,11 +516,12 @@ planexpboost_ui: +{0}% XP for {1}
 player_info_armor: Armor
 player_info_steam: Steam
 player_info_xp: Experience
 player_label: ' <color={1}>L{0}</color>'
 player_label_admin: ' <color={1}>L{0} A</color>'
-quest_active_heading: Mission <size=65%>{0}/{1}</size>
+quest_active_heading: '{0} <size=65%>{1}/{2}</size>'
+quest_active_heading_other: '{0}'
 quest_active_inactive: ''
 quest_goal_collect: Collect {0} <color=#FBB040>{1}</color>
 quest_goal_collect_dungeon: Collect {0} <color=#FBB040>{1}</color> in <color=#FBB040>{2}</color>
 quest_goal_collect_unit: Collect {0} <color=#FBB040>{1}</color> from <color=#FBB040>{2}</color>
 quest_goal_collect_unit_dungeon: Collect {0} <color=#FBB040>{1}</color> from <color=#FBB040>{2}</color> in <color=#FBB040>{3}</color>
@@ -544,19 +546,22 @@ quest_island_goal_level: Reach <color=#FBB040>level {0}</color> to be strong eno
 quest_island_subtitle: <color=#FBB040>Special Mission for {0}</color>
 quest_island_title: Free {0} from Imperial control
 quest_item_default: Item
 quest_item_format: T{0} {1}
 quest_label: L{1} {0}
-quest_log_select: Set active mission
-quest_log_title: Mission Log
-quest_popup_action_accept: <color=#FBB040>[<action:43>]</color> Accept mission
-quest_popup_action_active: <color=#FBB040>[<action:43>]</color> Make active mission
+quest_log_crafting_select: Set active crafting recipe
+quest_log_crafting_title: Crafting Recipes
+quest_log_normal_select: Set active mission
+quest_log_normal_title: Mission Log
+quest_popup_action_accept: <color=#FBB040>[<action:43>]</color> Accept {type}
+quest_popup_action_active: <color=#FBB040>[<action:43>]</color> Make active {type}
+quest_popup_action_handin_items: <color=#FBB040>[<action:43>]</color> Hand in items
 quest_popup_action_incomplete: Complete the tasks above
 quest_popup_action_return: <color=#FBB040>[<action:43>]</color> Claim reward
 quest_popup_rewards_loading: Loading...
 quest_popup_rewards_title: 'Rewards:'
-quest_popup_status_accepted: Mission Accepted
+quest_popup_status_accepted: '{type} Accepted'
 quest_popup_status_completed: COMPLETED
 quest_reward_prob_hidden: '%'
 quest_reward_prob_vague: '{0} %'
 quest_reward_quest: 'Quest: {0}'
 quest_reward_unlock: 'Unlock: {0}'
@@ -571,18 +576,20 @@ quest_reward_vague_categories:
 quest_time_long: <color=#{0}>{1:00}:{2:00}:{3:00} remaining</color>
 quest_time_low: FBB040
 quest_time_normal: FFFFFF
 quest_time_short: <color=#{0}>{2:00}:{3:00} remaining</color>
 quest_time_warn: D4372A
-questnotify_cancelled: Mission Cancelled
-questnotify_completed: Mission Completed
+quest_type_crafting: Crafting Recipe
+quest_type_normal: Mission
+questnotify_cancelled: '{0} Cancelled'
+questnotify_completed: '{0} Completed'
 questnotify_completed_rewards: '
 
   <size=20>Rewards:'
 questnotify_completed_rewards_end: </size>
-questnotify_failed: Mission Failed
-questnotify_new: New Mission Acquired
+questnotify_failed: '{0} Failed'
+questnotify_new: New {0} Acquired
 quick_chat_greeting: Good Skies!
 quick_chat_help: Help!
 quick_chat_landmark: At {0}!
 quick_chat_landmark_empty: Rally to me!
 quick_chat_landmark_finalboss: Meowza is coming!
@@ -659,10 +666,11 @@ tutorial_no_slots_error: You could not enter the tutorial. You need at least one
 unit_label_format: '{0} L{1}'
 unknown: '[unknown]'
 unlock_header: New Class Unlocked!
 upcoming_events_happening_now: <color=#F0DD9D>Happening now</color>
 upcoming_events_news_posted_at: 'Posted at: {0}'
+upcoming_events_schedule_line: '- {0}  -  {1}'
 upcoming_events_time_format: htt, MMMM d
 upgrade_fx_armor: Armor Upgrade!
 upgrade_fx_engine: Engine Upgrade!
 upgrade_fx_gun: Gun Upgrade!
 upgrade_fx_secondary: Secondary Upgrade!
diff --git config_180702_1804/camera.txt config_180706_1705/camera.txt
index 8f8133a..2c5d10b 100644
--- config_180702_1804/camera.txt
+++ config_180706_1705/camera.txt
@@ -1,5 +1,6 @@
+audioListenerHeight: '5'
 cameraRotationMaxRate: '180'
 cameraRotationTimeConstant: '0.5'
 doesCameraRotateWithPlayer: 'false'
 fov: '30'
 isOrthographic: 'false'
diff --git config_180702_1804/events.txt config_180706_1705/events.txt
index 5b764fd..6ce1312 100644
--- config_180702_1804/events.txt
+++ config_180706_1705/events.txt
@@ -1,68 +1,79 @@
+event_biweekly_week1_monday:
+  Times:
+  - RunsFor: '100'
+    StartsAt:
+      day: '13'
+      dayOfWeek: '3'
+      hour: '17'
+      minute: '0'
+      month: '6'
 event_daily_friday:
-  Time:
-    RunsFor: '23:00'
+  Times:
+  - RunsFor: '23:00'
     StartsAt:
       dayOfWeek: '5'
       hour: '8'
       minute: '00'
 event_daily_monday:
-  Time:
-    RunsFor: '23:00'
+  Times:
+  - RunsFor: '23:00'
     StartsAt:
       dayOfWeek: '1'
       hour: '8'
       minute: '00'
 event_daily_saturday:
-  Time:
-    RunsFor: '23:00'
+  Times:
+  - RunsFor: '23:00'
     StartsAt:
       dayOfWeek: '6'
       hour: '8'
       minute: '00'
 event_daily_sunday:
-  Time:
-    RunsFor: '23:00'
+  Times:
+  - RunsFor: '23:00'
     StartsAt:
       dayOfWeek: '0'
       hour: '8'
       minute: '00'
 event_daily_thursday:
-  Time:
-    RunsFor: '23:00'
+  Times:
+  - RunsFor: '23:00'
     StartsAt:
       dayOfWeek: '4'
       hour: '8'
       minute: '00'
 event_daily_tuesday:
-  Time:
-    RunsFor: '23:00'
+  Times:
+  - RunsFor: '23:00'
     StartsAt:
       dayOfWeek: '2'
       hour: '8'
       minute: '00'
 event_daily_wednesday:
-  Time:
-    RunsFor: '23:00'
+  Times:
+  - RunsFor: '23:00'
     StartsAt:
       dayOfWeek: '3'
       hour: '8'
       minute: '00'
 playtest_event:
-  Time:
-    RunsFor: '5'
+  Times:
+  - RunsFor: '5'
     StartsAt:
       day: '13'
       dayOfWeek: '3'
       hour: '17'
       minute: '0'
       month: '6'
 test_event:
   IsVisibleToClient: 'false'
   LoreDistanceFromWall: '8'
   LoreDuration: '10'
   LoreWithinRadiusOfPlayer: '4'
-  Time:
-    RunsFor: 00:01
+  Times:
+  - RunsFor: 00:01
+    StartsAt:
+      hour: '2'
+  - RunsFor: 00:01
     StartsAt:
-      hour: '*'
-      minute: '*/2'
+      hour: '1'
diff --git config_180702_1804/global.txt config_180706_1705/global.txt
index 37ae413..42c98dd 100644
--- config_180702_1804/global.txt
+++ config_180706_1705/global.txt
@@ -20,10 +20,12 @@ audit:
   movementSimulationAutocorrectFactor: '0.1'
   recentMissedBulletCountThreshold: '10'
   recentMissedBulletSnoozeTime: '300'
   recentMissedBulletTimeWindow: '60'
   sendMovementCheckDataWithInputs: 'true'
+  speedHackBufferSize: '10'
+  speedHackThreshold: '1.2'
   teleportIgnoreErrorTimeout: '5'
 autoEquipInventoryDefault: 'true'
 autoGunAimDeltaThreshold: '15'
 autoGunFireThreshold: '0.3'
 backend: ozy
diff --git config_180702_1804/index.txt config_180706_1705/index.txt
index 16f701f..6ae33fd 100644
--- config_180702_1804/index.txt
+++ config_180706_1705/index.txt
@@ -58,10 +58,11 @@
 - Dungeons/dungeon_tutorial
 - Dungeons/dungeons
 - Items/armor
 - Items/cloud
 - Items/consumable
+- Items/crafting
 - Items/dungeon
 - Items/dungeonkey
 - Items/engine
 - Items/laser
 - Items/machinegun
diff --git config_180702_1804/news.txt config_180706_1705/news.txt
index 5100f6c..266300d 100644
--- config_180702_1804/news.txt
+++ config_180706_1705/news.txt
@@ -15,8 +15,12 @@ news_reliable_remiges:
   Url: https://community.steambirds.com/blog/324
 news_sterling_shrikes:
   IsVisibleToClient: 'true'
   Time: 2018-06-26 00:00
   Url: https://community.steambirds.com/blog/325
+news_toucan_tomia:
+  IsVisibleToClient: 'true'
+  Time: 2018-07-05 22:00
+  Url: https://community.steambirds.com/blog/326
 test_news:
   IsVisibleToClient: 'false'
   Time: 2018-05-31 00:00
diff --git config_180702_1804/playerclasses.txt config_180706_1705/playerclasses.txt
index 1bf3c3c..2caa47e 100644
--- config_180702_1804/playerclasses.txt
+++ config_180706_1705/playerclasses.txt
@@ -126,48 +126,48 @@ assault:
     prefab: PlayerAssault
   - hideIfLocked: 'true'
     id: gold
     prefab: PlayerAssaultGold
     unlockItemId: playerclass_gold_assault
-  - extraColor1: de053d
-    extraColor2: 35545a
-    extraColor3: b8f2ec
+  - extraColor1: c31536
+    extraColor2: 2e2d27
+    extraColor3: dad5c1
     hideIfLocked: 'true'
     id: flames
     livery: flames.assault
     prefab: PlayerAssault
     unlockItemId: playerclass_assault_flames
-  - extraColor1: 2284df
-    extraColor2: 2c5299
-    extraColor3: eb9917
+  - extraColor1: 1477e5
+    extraColor2: 0a3984
+    extraColor3: e27714
     hideIfLocked: 'true'
     id: spikes
     livery: spikes.assault
     prefab: PlayerAssault
     unlockItemId: playerclass_assault_spikes
-  - extraColor1: cfe3de
-    extraColor2: 95a8a2
-    extraColor3: 5f6a66
+  - extraColor1: 3a0025
+    extraColor2: d50099
+    extraColor3: f7dee6
     hideIfLocked: 'true'
-    id: camo
-    livery: camo.assault
+    id: stars
+    livery: stars.assault
     prefab: PlayerAssault
-    unlockItemId: playerclass_assault_camo
-  - extraColor1: de053d
-    extraColor2: 35545a
-    extraColor3: b8f2ec
+    unlockItemId: playerclass_assault_stars
+  - extraColor1: b9b5a3
+    extraColor2: da3420
+    extraColor3: da3420
     hideIfLocked: 'true'
     id: VariantA
-    livery: flames.assault
+    livery: stripes.assault
     prefab: PlayerAssaultVariantA
     unlockItemId: playerclass_assault_varianta
-  - extraColor1: 2284df
-    extraColor2: 2c5299
-    extraColor3: eb9917
+  - extraColor1: 2e2d27
+    extraColor2: dba525
+    extraColor3: dba525
     hideIfLocked: 'true'
     id: VariantB
-    livery: spikes.assault
+    livery: caution.assault
     prefab: PlayerAssaultVariantB
     unlockItemId: playerclass_assault_variantb
 duster:
   actions:
     Armor:
@@ -224,16 +224,48 @@ duster:
   - cap: '50'
     statName: minSpeed
   variants:
   - id: default
     prefab: PlayerDuster
-  - hideIfLocked: 'true'
+  - extraColor1: afcc27
+    extraColor2: b9b5a3
+    extraColor3: 2a043d
+    hideIfLocked: 'true'
+    id: flames
+    livery: flames.duster
+    prefab: PlayerDuster
+    unlockItemId: playerclass_duster_flames
+  - extraColor1: 072c33
+    extraColor2: dba525
+    extraColor3: b9b5a3
+    hideIfLocked: 'true'
+    id: spikes
+    livery: spikes.duster
+    prefab: PlayerDuster
+    unlockItemId: playerclass_duster_spikes
+  - extraColor1: dd560d
+    extraColor2: 1db2c7
+    extraColor3: dcd7bf
+    hideIfLocked: 'true'
+    id: stars
+    livery: stars.duster
+    prefab: PlayerDuster
+    unlockItemId: playerclass_duster_stars
+  - extraColor1: 2e2d27
+    extraColor2: dba525
+    extraColor3: dba525
+    hideIfLocked: 'true'
     id: VariantA
+    livery: caution.duster
     prefab: PlayerDusterVariantA
     unlockItemId: playerclass_duster_varianta
-  - hideIfLocked: 'true'
+  - extraColor1: b9b5a3
+    extraColor2: 1477e5
+    extraColor3: 1477e5
+    hideIfLocked: 'true'
     id: VariantB
+    livery: stripes.duster
     prefab: PlayerDusterVariantB
     unlockItemId: playerclass_duster_variantb
 engineer:
   actions:
     Armor:
@@ -297,16 +329,48 @@ engineer:
   - cap: '50'
     statName: minSpeed
   variants:
   - id: default
     prefab: PlayerEngineer
-  - hideIfLocked: 'true'
+  - extraColor1: dba525
+    extraColor2: 2e2d27
+    extraColor3: 76190f
+    hideIfLocked: 'true'
+    id: flames
+    livery: flames.engineer
+    prefab: PlayerEngineer
+    unlockItemId: playerclass_engineer_flames
+  - extraColor1: 3d2509
+    extraColor2: 1db2c7
+    extraColor3: e27714
+    hideIfLocked: 'true'
+    id: spikes
+    livery: spikes.engineer
+    prefab: PlayerEngineer
+    unlockItemId: playerclass_engineer_spikes
+  - extraColor1: 1477e5
+    extraColor2: c31536
+    extraColor3: dba525
+    hideIfLocked: 'true'
+    id: stars
+    livery: stars.engineer
+    prefab: PlayerEngineer
+    unlockItemId: playerclass_engineer_stars
+  - extraColor1: b9b5a3
+    extraColor2: dba525
+    extraColor3: dba525
+    hideIfLocked: 'true'
     id: VariantA
+    livery: stripes.engineer
     prefab: PlayerEngineerVariantA
     unlockItemId: playerclass_engineer_varianta
-  - hideIfLocked: 'true'
+  - extraColor1: 2e2d27
+    extraColor2: dba525
+    extraColor3: dba525
+    hideIfLocked: 'true'
     id: VariantB
+    livery: caution.engineer
     prefab: PlayerEngineerVariantB
     unlockItemId: playerclass_engineer_variantb
 medic:
   additionalTutorial: DungeonTutorial2
   allowedItemTags:
@@ -364,60 +428,59 @@ medic:
   - cap: '50'
     statName: maxSpeed
   - cap: '50'
     statName: minSpeed
   variants:
-  - extraColor1: c31536
-    extraColor2: bbb3a4
-    extraColor3: 2e1419
-    id: default
+  - id: default
     prefab: PlayerMedic
-  - extraColor1: 1b74cf
-    extraColor2: bbb3a4
-    extraColor3: bbb3a4
+  - extraColor1: 1db2c7
+    extraColor2: e1ddcc
+    extraColor3: 0e5765
     hideIfLocked: 'true'
     id: flames
     livery: flames.medic
     prefab: PlayerMedic
     unlockItemId: playerclass_medic_flames
-  - extraColor1: '117054'
-    extraColor2: 95bb0f
-    extraColor3: 95bb0f
+  - extraColor1: 0e5765
+    extraColor2: 55c91d
+    extraColor3: 55c91d
     hideIfLocked: 'true'
     id: spikes
     livery: spikes.medic
     prefab: PlayerMedic
     unlockItemId: playerclass_medic_spikes
-  - extraColor1: 67493a
-    extraColor2: '988268'
-    extraColor3: 615b46
+  - extraColor1: e3dec7
+    extraColor2: dd560d
+    extraColor3: e3dec7
     hideIfLocked: 'true'
-    id: camo
-    livery: camo.medic
+    id: stars
+    livery: stars.medic
     prefab: PlayerMedic
-    unlockItemId: playerclass_medic_camo
-  - extraColor1: c31536
-    extraColor2: bbb3a4
-    extraColor3: 2e1419
+    unlockItemId: playerclass_medic_stars
+  - extraColor1: 2e2d27
+    extraColor2: dba525
+    extraColor3: dba525
     hideIfLocked: 'true'
     id: VariantA
+    livery: caution.medic
     prefab: PlayerMedicVariantA
     unlockItemId: playerclass_medic_varianta
-  - extraColor1: c31536
-    extraColor2: bbb3a4
-    extraColor3: 2e1419
+  - extraColor1: b9b5a3
+    extraColor2: dd560d
+    extraColor3: dd560d
     hideIfLocked: 'true'
     id: VariantB
+    livery: stripes.medic
     prefab: PlayerMedicVariantB
     unlockItemId: playerclass_medic_variantb
   - cloudOverride: healCloudFXPremium
-    extraColor1: ebddc3
-    extraColor2: 1c1a26
-    extraColor3: 1c1a26
+    extraColor1: cfe3de
+    extraColor2: 95a8a2
+    extraColor3: 5f6a66
     hideIfLocked: 'true'
     id: EpicA
-    livery: ghost.medic
+    livery: camo.medic
     prefab: PlayerMedicVariantA
     superTrail: SuperSpeedAfterburn
     unlockItemId: playerclass_medic_epica
 olfaithful:
   actions:
@@ -484,41 +547,43 @@ olfaithful:
   - extraColor1: 662c6c
     extraColor2: 390f3d
     extraColor3: df1870
     hideIfLocked: 'true'
     id: flames
-    livery: flames.olfaithful
+    livery: flames.oldfaithful
     prefab: PlayerOldFaithful
     unlockItemId: playerclass_oldfaithful_flames
   - extraColor1: 0979b9
     extraColor2: 0f3b55
     extraColor3: 91d7ff
     hideIfLocked: 'true'
     id: spikes
-    livery: spikes.olfaithful
+    livery: spikes.oldfaithful
     prefab: PlayerOldFaithful
     unlockItemId: playerclass_oldfaithful_spikes
-  - extraColor1: 3f5e51
-    extraColor2: 1a2726
-    extraColor3: 988b68
+  - extraColor1: deceb2
+    extraColor2: c71324
+    extraColor3: 1d0d1f
     hideIfLocked: 'true'
-    id: camo
-    livery: camo.olfaithful
+    id: stars
+    livery: stars.oldfaithful
     prefab: PlayerOldFaithful
-    unlockItemId: playerclass_oldfaithful_camo
-  - extraColor1: '119669'
-    extraColor2: 2e1025
-    extraColor3: '119669'
+    unlockItemId: playerclass_oldfaithful_stars
+  - extraColor1: b9b5a3
+    extraColor2: 1db2c7
+    extraColor3: 1db2c7
     hideIfLocked: 'true'
     id: VarientA
+    livery: stripes.oldfaithful
     prefab: PlayerOldFaithfulVariantA
     unlockItemId: playerclass_oldfaithful_varianta
-  - extraColor1: 28151b
-    extraColor2: dacfb4
-    extraColor3: 28151b
+  - extraColor1: 2e2d27
+    extraColor2: dba525
+    extraColor3: dba525
     hideIfLocked: 'true'
     id: VariantB
+    livery: caution.oldfaithful
     prefab: PlayerOldFaithfulVariantB
     unlockItemId: playerclass_oldfaithful_variantb
 paladin:
   actions:
     Engine:
@@ -580,16 +645,48 @@ paladin:
   - cap: '50'
     statName: minSpeed
   variants:
   - id: default
     prefab: PlayerPaladin
-  - hideIfLocked: 'true'
+  - extraColor1: b9b5a3
+    extraColor2: '161210'
+    extraColor3: c31536
+    hideIfLocked: 'true'
+    id: flames
+    livery: flames.paladin
+    prefab: PlayerPaladin
+    unlockItemId: playerclass_paladin_flames
+  - extraColor1: 2a043d
+    extraColor2: 1db2c7
+    extraColor3: 1db2c7
+    hideIfLocked: 'true'
+    id: spikes
+    livery: spikes.paladin
+    prefab: PlayerPaladin
+    unlockItemId: playerclass_paladin_spikes
+  - extraColor1: dba525
+    extraColor2: b9b5a3
+    extraColor3: 051c45
+    hideIfLocked: 'true'
+    id: stars
+    livery: stars.paladin
+    prefab: PlayerPaladin
+    unlockItemId: playerclass_paladin_stars
+  - extraColor1: b9b5a3
+    extraColor2: ad10db
+    extraColor3: ad10db
+    hideIfLocked: 'true'
     id: VariantA
+    livery: stripes.paladin
     prefab: PlayerPaladinVariantA
     unlockItemId: playerclass_paladin_varianta
-  - hideIfLocked: 'true'
+  - extraColor1: 2e2d27
+    extraColor2: dba525
+    extraColor3: dba525
+    hideIfLocked: 'true'
     id: VariantB
+    livery: caution.paladin
     prefab: PlayerPaladinVariantB
     unlockItemId: playerclass_paladin_variantb
 pirate:
   actions:
     Armor:
@@ -666,10 +763,48 @@ pirate:
   - cap: '50'
     statName: minSpeed
   variants:
   - id: default
     prefab: PlayerBandit
+  - extraColor1: 2e2d27
+    extraColor2: '060507'
+    extraColor3: c31536
+    hideIfLocked: 'true'
+    id: flames
+    livery: flames.bandit
+    prefab: PlayerBandit
+    unlockItemId: playerclass_bandit_flames
+  - extraColor1: dba525
+    extraColor2: 072c33
+    extraColor3: 1db2c7
+    hideIfLocked: 'true'
+    id: spikes
+    livery: spikes.bandit
+    prefab: PlayerBandit
+    unlockItemId: playerclass_bandit_spikes
+  - extraColor1: afcc27
+    extraColor2: 2e2d27
+    extraColor3: da3420
+    hideIfLocked: 'true'
+    id: stars
+    livery: stars.bandit
+    prefab: PlayerBandit
+    unlockItemId: playerclass_bandit_stars
+  - extraColor1: b9b5a3
+    extraColor2: 1477e5
+    extraColor3: 1477e5
+    hideIfLocked: 'true'
+    id: VariantA
+    livery: stripes.bandit
+    prefab: PlayerBanditVariantA
+  - extraColor1: 2e2d27
+    extraColor2: dba525
+    extraColor3: dba525
+    hideIfLocked: 'true'
+    id: VariantB
+    livery: caution.bandit
+    prefab: PlayerBanditVariantB
 rapier:
   actions:
     MainGun:
     - buff:
       - amount: '0.3'
@@ -746,16 +881,48 @@ rapier:
   - cap: '50'
     statName: minSpeed
   variants:
   - id: default
     prefab: PlayerRaptor
-  - hideIfLocked: 'true'
+  - extraColor1: 2c0f3a
+    extraColor2: b9b5a3
+    extraColor3: e27714
+    hideIfLocked: 'true'
+    id: flames
+    livery: flames.raptor
+    prefab: PlayerRaptor
+    unlockItemId: playerclass_raptor_flames
+  - extraColor1: dba525
+    extraColor2: 140d1b
+    extraColor3: e0dcc8
+    hideIfLocked: 'true'
+    id: spikes
+    livery: spikes.raptor
+    prefab: PlayerRaptor
+    unlockItemId: playerclass_raptor_spikes
+  - extraColor1: '260877'
+    extraColor2: 1477e5
+    extraColor3: b9b5a3
+    hideIfLocked: 'true'
+    id: stars
+    livery: stars.raptor
+    prefab: PlayerRaptor
+    unlockItemId: playerclass_raptor_stars
+  - extraColor1: 2e2d27
+    extraColor2: dba525
+    extraColor3: dba525
+    hideIfLocked: 'true'
     id: VariantA
+    livery: caution.raptor
     prefab: PlayerRaptorVariantA
     unlockItemId: playerclass_raptor_varianta
-  - hideIfLocked: 'true'
+  - extraColor1: b9b5a3
+    extraColor2: e27714
+    extraColor3: e27714
+    hideIfLocked: 'true'
     id: VariantB
+    livery: stripes.raptor
     prefab: PlayerRaptorVariantB
     unlockItemId: playerclass_raptor_variantb
 support:
   actions:
     Armor:
@@ -822,16 +989,48 @@ support:
   - cap: '50'
     statName: minSpeed
   variants:
   - id: default
     prefab: PlayerShieldMaiden
-  - hideIfLocked: 'true'
+  - extraColor1: 3d0c07
+    extraColor2: '060507'
+    extraColor3: da3420
+    hideIfLocked: 'true'
+    id: flames
+    livery: flames.shieldmaiden
+    prefab: PlayerShieldMaiden
+    unlockItemId: playerclass_shieldmaiden_flames
+  - extraColor1: 1477e5
+    extraColor2: b9b5a3
+    extraColor3: 051c45
+    hideIfLocked: 'true'
+    id: spikes
+    livery: spikes.shieldmaiden
+    prefab: PlayerShieldMaiden
+    unlockItemId: playerclass_shieldmaiden_spikes
+  - extraColor1: 5010db
+    extraColor2: '540877'
+    extraColor3: dba525
+    hideIfLocked: 'true'
+    id: stars
+    livery: stars.shieldmaiden
+    prefab: PlayerShieldMaiden
+    unlockItemId: playerclass_shieldmaiden_stars
+  - extraColor1: 2e2d27
+    extraColor2: dba525
+    extraColor3: dba525
+    hideIfLocked: 'true'
     id: VariantA
+    livery: caution.shieldmaiden
     prefab: PlayerShieldMaidenVariantA
     unlockItemId: playerclass_shieldmaiden_varianta
-  - hideIfLocked: 'true'
+  - extraColor1: b9b5a3
+    extraColor2: 5010db
+    extraColor3: 5010db
+    hideIfLocked: 'true'
     id: VariantB
+    livery: stripes.shieldmaiden
     prefab: PlayerShieldMaidenVariantB
     unlockItemId: playerclass_shieldmaiden_variantb
 tank:
   additionalTutorial: DungeonTutorial2
   allowedItemTags:
@@ -891,25 +1090,57 @@ tank:
   - cap: '50'
     statName: minSpeed
   variants:
   - id: default
     prefab: PlayerHog
-  - hideIfLocked: 'true'
+  - extraColor1: 0a3984
+    extraColor2: b9b5a3
+    extraColor3: dba525
+    hideIfLocked: 'true'
+    id: flames
+    livery: flames.hog
+    prefab: PlayerRaptor
+    unlockItemId: playerclass_hog_flames
+  - extraColor1: 0b070f
+    extraColor2: b9b5a3
+    extraColor3: b9b5a3
+    hideIfLocked: 'true'
+    id: spikes
+    livery: spikes.hog
+    prefab: PlayerRaptor
+    unlockItemId: playerclass_hog_spikes
+  - extraColor1: c31536
+    extraColor2: dad6c3
+    extraColor3: dba525
+    hideIfLocked: 'true'
+    id: stars
+    livery: stars.hog
+    prefab: PlayerRaptor
+    unlockItemId: playerclass_hog_stars
+  - extraColor1: 2e2d27
+    extraColor2: dba525
+    extraColor3: dba525
+    hideIfLocked: 'true'
     id: VariantA
+    livery: caution.hog
     prefab: PlayerHog
     unlockItemId: playerclass_hog_varianta
-  - hideIfLocked: 'true'
+  - extraColor1: b9b5a3
+    extraColor2: 55c91d
+    extraColor3: 55c91d
+    hideIfLocked: 'true'
     id: VariantB
+    livery: stripes.hog
     prefab: PlayerHog
     unlockItemId: playerclass_hog_variantb
   - cloudOverride: poisonBlastFXPremium
-    extraColor1: ebddc3
-    extraColor2: 1c1a26
-    extraColor3: 1c1a26
+    extraColor1: cfe3de
+    extraColor2: 95a8a2
+    extraColor3: 5f6a66
     hideIfLocked: 'true'
     id: EpicA
-    livery: ghost.hog
+    livery: camo.hog
     prefab: PlayerHogVariantB
     superTrail: SuperSpeedAfterburn
     unlockItemId: playerclass_hog_epica
 walker:
   additionalTutorial: DungeonTutorialWalker2
@@ -970,31 +1201,57 @@ walker:
   - cap: '50'
     statName: minSpeed
   variants:
   - id: default
     prefab: PlayerWalker
-  - extraColor1: c31536
-    extraColor2: 471b38
-    extraColor3: 2e1419
+  - extraColor1: 2a043d
+    extraColor2: b9b5a3
+    extraColor3: da3420
+    hideIfLocked: 'true'
+    id: flames
+    livery: flames.walker
+    prefab: PlayerWalker
+    unlockItemId: playerclass_walker_flames
+  - extraColor1: '117054'
+    extraColor2: 95bb0f
+    extraColor3: 95bb0f
+    hideIfLocked: 'true'
+    id: spikes
+    livery: spikes.walker
+    prefab: PlayerWalker
+    unlockItemId: playerclass_walker_spikes
+  - extraColor1: d50099
+    extraColor2: 3a0025
+    extraColor3: e6e3d3
+    hideIfLocked: 'true'
+    id: stars
+    livery: stars.walker
+    prefab: PlayerWalker
+    unlockItemId: playerclass_walker_stars
+  - extraColor1: b9b5a3
+    extraColor2: c31536
+    extraColor3: c31536
     hideIfLocked: 'true'
     id: VariantA
+    livery: stripes.walker
     prefab: PlayerWalkerVariantA
     unlockItemId: playerclass_walker_varianta
-  - extraColor1: 109bdc
-    extraColor2: d7d4b6
-    extraColor3: 2e1419
+  - extraColor1: 2e2d27
+    extraColor2: dba525
+    extraColor3: dba525
     hideIfLocked: 'true'
     id: VariantB
+    livery: caution.walker
     prefab: PlayerWalkerVariantB
     unlockItemId: playerclass_walker_variantb
   - cloudOverride: damageBlastFXPremium
-    extraColor1: ebddc3
-    extraColor2: 1c1a26
-    extraColor3: 1c1a26
+    extraColor1: cfe3de
+    extraColor2: 95a8a2
+    extraColor3: 5f6a66
     hideIfLocked: 'true'
     id: EpicA
-    livery: ghost.walker
+    livery: camo.walker
     prefab: PlayerWalkerVariantA
     superTrail: SuperSpeedAfterburn
     unlockItemId: playerclass_walker_epica
 wizard:
   actions:
@@ -1070,13 +1327,45 @@ wizard:
   - cap: '50'
     statName: minSpeed
   variants:
   - id: default
     prefab: PlayerMerlin
-  - hideIfLocked: 'true'
+  - extraColor1: 0a3984
+    extraColor2: 13043d
+    extraColor3: e27714
+    hideIfLocked: 'true'
+    id: flames
+    livery: flames.merlin
+    prefab: PlayerMerlin
+    unlockItemId: playerclass_merlin_flames
+  - extraColor1: 2a043d
+    extraColor2: '143407'
+    extraColor3: 55c91d
+    hideIfLocked: 'true'
+    id: spikes
+    livery: spikes.merlin
+    prefab: PlayerMerlin
+    unlockItemId: playerclass_merlin_spikes
+  - extraColor1: 2a043d
+    extraColor2: b9b5a3
+    extraColor3: d50099
+    hideIfLocked: 'true'
+    id: stars
+    livery: stars.merlin
+    prefab: PlayerMerlin
+    unlockItemId: playerclass_merlin_stars
+  - extraColor1: b9b5a3
+    extraColor2: d50099
+    extraColor3: d50099
+    hideIfLocked: 'true'
     id: VariantA
+    livery: stripes.merlin
     prefab: PlayerMerlinVariantA
     unlockItemId: playerclass_merlin_varianta
-  - hideIfLocked: 'true'
+  - extraColor1: 2e2d27
+    extraColor2: dba525
+    extraColor3: dba525
+    hideIfLocked: 'true'
     id: VariantB
+    livery: caution.merlin
     prefab: PlayerMerlinVariantB
     unlockItemId: playerclass_merlin_variantb
diff --git config_180702_1804/questGivers.txt config_180706_1705/questGivers.txt
index eac3ab6..e2a8a75 100644
--- config_180702_1804/questGivers.txt
+++ config_180706_1705/questGivers.txt
@@ -3,10 +3,11 @@
   location: nowhere
   permanentQuests:
   - id: test_permanent_giver
   - id: test_dungeon_ice
   - id: test_spawn_piece
+  - id: test_crafting
   questTables:
     basics:
       genCount: '3'
       maxDuration: 0:20
       quests:
@@ -231,5 +232,13 @@
       genCount: '1'
       maxDuration: 01.00:00:00.00
       quests:
       - id: dailyreward_Wednesday
       schedule: 0 0 * * 3
+- completeGuidanceTargets:
+  - crafter
+  - portal_Nexus
+  id: crafter
+  location: nexus
+  permanentQuests:
+  - id: test_crafting
+  - id: craft_laser_fire
diff --git config_180702_1804/store.txt config_180706_1705/store.txt
index 17b6902..2dd2a05 100644
--- config_180702_1804/store.txt
+++ config_180706_1705/store.txt
@@ -1507,38 +1507,10 @@ products:
       currency: gold
   - id: scrap
     price:
       amount: '15000'
       currency: scrap
-  id: store_unlock_playerclass_assault_camo
-  items:
-  - unlock_playerclass_assault_camo
-  tags:
-  - item_variant_common
-- additional_price_tags:
-  - id: normal
-    price:
-      amount: '5000'
-      currency: gold
-  - id: scrap
-    price:
-      amount: '15000'
-      currency: scrap
-  id: store_unlock_playerclass_assault_camo
-  items:
-  - unlock_playerclass_assault_camo
-  tags:
-  - item_variant_common
-- additional_price_tags:
-  - id: normal
-    price:
-      amount: '5000'
-      currency: gold
-  - id: scrap
-    price:
-      amount: '15000'
-      currency: scrap
   id: store_unlock_playerclass_medic_flames
   items:
   - unlock_playerclass_medic_flames
   tags:
   - item_variant_common
@@ -1563,24 +1535,10 @@ products:
       currency: gold
   - id: scrap
     price:
       amount: '15000'
       currency: scrap
-  id: store_unlock_playerclass_medic_camo
-  items:
-  - unlock_playerclass_medic_camo
-  tags:
-  - item_variant_common
-- additional_price_tags:
-  - id: normal
-    price:
-      amount: '5000'
-      currency: gold
-  - id: scrap
-    price:
-      amount: '15000'
-      currency: scrap
   id: store_unlock_playerclass_oldfaithful_flames
   items:
   - unlock_playerclass_oldfaithful_flames
   tags:
   - item_variant_common
@@ -1596,24 +1554,10 @@ products:
   id: store_unlock_playerclass_oldfaithful_spikes
   items:
   - unlock_playerclass_oldfaithful_spikes
   tags:
   - item_variant_common
-- additional_price_tags:
-  - id: normal
-    price:
-      amount: '5000'
-      currency: gold
-  - id: scrap
-    price:
-      amount: '15000'
-      currency: scrap
-  id: store_unlock_playerclass_oldfaithful_camo
-  items:
-  - unlock_playerclass_oldfaithful_camo
-  tags:
-  - item_variant_common
 - id: store_unlock_playerclass_assault_varianta
   items:
   - unlock_playerclass_assault_varianta
   normal_price:
     amount: '7000'
@@ -1829,18 +1773,24 @@ products:
     currency: gold
   tags:
   - unlocks
   unlocks:
   - playerclass_medic
-- icon: ItemUnlock
+- additional_price_tags:
+  - id: normal
+    price:
+      amount: '1000'
+      currency: gold
+  - id: scrap
+    price:
+      amount: '3000'
+      currency: scrap
+  icon: ItemUnlock
   id: unlock_emote_love_fireworks
   max_per_account: '1'
   max_per_account_count_unlocks: 'true'
-  normal_price:
-    amount: '123'
-    currency: gold
-  preRelease: 'true'
+  preRelease: 'false'
   preview_camera_direction:
   - '0'
   - '1'
   - '0'
   preview_camera_offset:
@@ -1856,21 +1806,27 @@ products:
   - '0'
   - '0'
   - '-1'
   tags:
   - unlocks
-  - emotes
+  - emotes_common
   unlocks:
   - emote_love_fireworks
-- icon: ItemUnlock
+- additional_price_tags:
+  - id: normal
+    price:
+      amount: '1000'
+      currency: gold
+  - id: scrap
+    price:
+      amount: '3000'
+      currency: scrap
+  icon: ItemUnlock
   id: unlock_emote_purple_fireworks
   max_per_account: '1'
   max_per_account_count_unlocks: 'true'
-  normal_price:
-    amount: '123'
-    currency: gold
-  preRelease: 'true'
+  preRelease: 'false'
   preview_camera_direction:
   - '0'
   - '1'
   - '0'
   preview_camera_offset:
@@ -1886,104 +1842,116 @@ products:
   - '0'
   - '0'
   - '-1'
   tags:
   - unlocks
-  - emotes
+  - emotes_common
   unlocks:
   - emote_purple_fireworks
-- icon: ItemUnlock
-  id: unlock_emote_rrr
+- additional_price_tags:
+  - id: normal
+    price:
+      amount: '1000'
+      currency: gold
+  - id: scrap
+    price:
+      amount: '3000'
+      currency: scrap
+  icon: ItemUnlock
+  id: unlock_emote_thumbsup
   max_per_account: '1'
   max_per_account_count_unlocks: 'true'
-  normal_price:
-    amount: '123'
-    currency: gold
-  preRelease: 'true'
+  preRelease: 'false'
   preview_camera_direction:
   - '0'
   - '0'
   - '1'
   preview_camera_offset:
   - '0'
   - '-30'
   - '0'
-  preview_clipping_area: '40'
-  preview_distance: '120'
-  preview_prefab_name: QuickChat_RRR
+  preview_clipping_area: '80'
+  preview_distance: '300'
+  preview_prefab_name: QuickChat_ThumbsUp
   preview_prefab_pool: UI
+  preview_reenable_timeout: '2'
   preview_rotation_speed: '0'
   preview_target_offset:
   - '0'
-  - '-30'
+  - '60'
   - '0'
   tags:
   - unlocks
-  - emotes
+  - emotes_common
   unlocks:
-  - emote_rrr
+  - emote_thumbsup
 - icon: ItemUnlock
-  id: unlock_emote_wings
+  id: unlock_emote_rrr
   max_per_account: '1'
   max_per_account_count_unlocks: 'true'
   normal_price:
     amount: '123'
     currency: gold
   preRelease: 'true'
   preview_camera_direction:
   - '0'
-  - '0.5'
+  - '0'
   - '1'
   preview_camera_offset:
   - '0'
+  - '-30'
   - '0'
-  - '0'
-  preview_clipping_area: '20'
-  preview_distance: '4'
-  preview_prefab_name: QuickChat_Wings
+  preview_clipping_area: '40'
+  preview_distance: '120'
+  preview_prefab_name: QuickChat_RRR
   preview_prefab_pool: UI
-  preview_rotation_speed: '30'
+  preview_rotation_speed: '0'
   preview_target_offset:
   - '0'
-  - '0'
+  - '-30'
   - '0'
   tags:
   - unlocks
   - emotes
   unlocks:
-  - emote_wings
-- icon: ItemUnlock
-  id: unlock_emote_thumbsup
+  - emote_rrr
+- additional_price_tags:
+  - id: normal
+    price:
+      amount: '1000'
+      currency: gold
+  - id: scrap
+    price:
+      amount: '3000'
+      currency: scrap
+  icon: ItemUnlock
+  id: unlock_emote_wings
   max_per_account: '1'
   max_per_account_count_unlocks: 'true'
-  normal_price:
-    amount: '123'
-    currency: gold
   preRelease: 'true'
   preview_camera_direction:
   - '0'
-  - '0'
+  - '0.5'
   - '1'
   preview_camera_offset:
   - '0'
-  - '-30'
   - '0'
-  preview_clipping_area: '80'
-  preview_distance: '300'
-  preview_prefab_name: QuickChat_ThumbsUp
+  - '0'
+  preview_clipping_area: '20'
+  preview_distance: '4'
+  preview_prefab_name: QuickChat_Wings
   preview_prefab_pool: UI
-  preview_reenable_timeout: '2'
-  preview_rotation_speed: '0'
+  preview_rotation_speed: '30'
   preview_target_offset:
   - '0'
-  - '60'
+  - '0'
   - '0'
   tags:
   - unlocks
   - emotes
   unlocks:
-  - emote_thumbsup
+  - emote_wings
 stores:
 - id: store_hangar
   sections:
   - id: general_banner
     max_product_count: '1'
@@ -2023,11 +1991,19 @@ stores:
   - icon: ItemUnlock
     id: general_emotes
     max_product_count: '32'
     product_selection:
       with_tags_any:
-      - emotes
+      - emotes_common
+    type: NORMAL
+  - icon: ItemUnlock
+    id: general_emotes_epic
+    max_product_count: '8'
+    product_selection:
+      with_tags_any:
+      - emotes_epic
+    show_within_other_section_in_ui: general_emotes
     type: NORMAL
   - icon: ItemDyeProduct
     iconHexColor: '000000'
     id: general_dye
     max_product_count: '12'
@@ -2045,35 +2021,35 @@ stores:
       - item_dye_detail_rare
     show_within_other_section_in_ui: general_dye
     type: NORMAL
   - icon: ItemDyeProduct
     id: general_dye_epic
-    max_product_count: '4'
+    max_product_count: '16'
     product_selection:
       with_tags_any:
       - item_dye_body_epic
       - item_dye_detail_epic
     show_within_other_section_in_ui: general_dye
     type: NORMAL
   - icon: ItemVariantProduct
     id: general_variant
-    max_product_count: '8'
+    max_product_count: '20'
     product_selection:
       with_tags_any:
       - item_variant_common
     type: NORMAL
   - icon: ItemVariantProduct
     id: general_variant_rare
-    max_product_count: '4'
+    max_product_count: '20'
     product_selection:
       with_tags_any:
       - item_variant_rare
     show_within_other_section_in_ui: general_variant
     type: NORMAL
   - icon: ItemVariantProduct
     id: general_variant_epic
-    max_product_count: '1'
+    max_product_count: '20'
     product_selection:
       with_tags_any:
       - item_variant_epic
     show_within_other_section_in_ui: general_variant
     type: NORMAL