Skip to content

Commit 01573b7

Browse files
authored
Merge pull request #53 from MengLeiFudge/test
初步适配分馏2.0,创世3.1
2 parents cbe8a0d + f7e0f13 commit 01573b7

File tree

219 files changed

+57980
-261080
lines changed

Some content is hidden

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

219 files changed

+57980
-261080
lines changed

data/FractionateEverything1.4.5.json

Lines changed: 0 additions & 15638 deletions
This file was deleted.

data/FractionateEverything2.0.0.json

Lines changed: 0 additions & 16626 deletions
This file was deleted.

data/GenesisBook3.1.0-alpha2.2_FractionateEverything2.0.0.json renamed to data/FractionateEverything2.1.3.json

Lines changed: 11704 additions & 10965 deletions
Large diffs are not rendered by default.

data/GenesisBook3.0.14.json

Lines changed: 0 additions & 11776 deletions
This file was deleted.

data/GenesisBook3.0.14_FractionateEverything1.4.5.json

Lines changed: 0 additions & 23202 deletions
This file was deleted.
Lines changed: 306 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4090,6 +4090,32 @@
40904090
"Proliferator": 3,
40914091
"IconName": "bullet"
40924092
},
4093+
{
4094+
"Type": 4,
4095+
"Factories": [
4096+
2303,
4097+
2318,
4098+
6257
4099+
],
4100+
"Name": "钛化弹箱",
4101+
"Items": [
4102+
1601,
4103+
1106
4104+
],
4105+
"ItemCounts": [
4106+
1,
4107+
1
4108+
],
4109+
"Results": [
4110+
1602
4111+
],
4112+
"ResultCounts": [
4113+
1
4114+
],
4115+
"TimeSpend": 120,
4116+
"Proliferator": 3,
4117+
"IconName": "bullet-titanium"
4118+
},
40934119
{
40944120
"Type": 4,
40954121
"Factories": [
@@ -5616,6 +5642,24 @@
56165642
"Proliferator": 3,
56175643
"IconName": "回收塔"
56185644
},
5645+
{
5646+
"Type": 14,
5647+
"Factories": [
5648+
6264
5649+
],
5650+
"Name": "物质回收",
5651+
"Items": [],
5652+
"ItemCounts": [],
5653+
"Results": [
5654+
1099
5655+
],
5656+
"ResultCounts": [
5657+
40
5658+
],
5659+
"TimeSpend": 6000,
5660+
"Proliferator": 1,
5661+
"IconName": "沙土回收_新"
5662+
},
56195663
{
56205664
"Type": 3,
56215665
"Factories": [
@@ -9669,6 +9713,20 @@
96699713
"GridIndex": 1405,
96709714
"IconName": "silicium-high-purity"
96719715
},
9716+
{
9717+
"ID": 1201,
9718+
"Type": 3,
9719+
"Name": "齿轮",
9720+
"GridIndex": 0,
9721+
"IconName": "gear-wheel"
9722+
},
9723+
{
9724+
"ID": 1102,
9725+
"Type": 2,
9726+
"Name": "磁铁",
9727+
"GridIndex": 0,
9728+
"IconName": "magnet"
9729+
},
96729730
{
96739731
"ID": 1202,
96749732
"Type": 3,
@@ -9914,6 +9972,13 @@
99149972
"GridIndex": 5402,
99159973
"IconName": "high-explosive"
99169974
},
9975+
{
9976+
"ID": 1130,
9977+
"Type": 3,
9978+
"Name": "晶石爆破单元",
9979+
"GridIndex": 0,
9980+
"IconName": "particle-explosive"
9981+
},
99179982
{
99189983
"ID": 1209,
99199984
"Type": 3,
@@ -10005,6 +10070,20 @@
1000510070
"GridIndex": 1206,
1000610071
"IconName": "terrain-tool"
1000710072
},
10073+
{
10074+
"ID": 1141,
10075+
"Type": 2,
10076+
"Name": "增产剂 Mk.I",
10077+
"GridIndex": 0,
10078+
"IconName": "accelerator-1"
10079+
},
10080+
{
10081+
"ID": 1142,
10082+
"Type": 2,
10083+
"Name": "增产剂 Mk.II",
10084+
"GridIndex": 0,
10085+
"IconName": "accelerator-2"
10086+
},
1000810087
{
1000910088
"ID": 1143,
1001010089
"Type": 2,
@@ -10019,6 +10098,13 @@
1001910098
"GridIndex": 5301,
1002010099
"IconName": "bullet"
1002110100
},
10101+
{
10102+
"ID": 1602,
10103+
"Type": 4,
10104+
"Name": "钛化弹箱",
10105+
"GridIndex": 0,
10106+
"IconName": "bullet-titanium"
10107+
},
1002210108
{
1002310109
"ID": 1603,
1002410110
"Type": 4,
@@ -10040,6 +10126,13 @@
1004010126
"GridIndex": 5502,
1004110127
"IconName": "cannonball-cluster"
1004210128
},
10129+
{
10130+
"ID": 1606,
10131+
"Type": 4,
10132+
"Name": "晶石炮弹组",
10133+
"GridIndex": 0,
10134+
"IconName": "cannonball-alloy"
10135+
},
1004310136
{
1004410137
"ID": 1607,
1004510138
"Type": 4,
@@ -10460,6 +10553,16 @@
1046010553
"Speed": 4.0,
1046110554
"Space": 23.76
1046210555
},
10556+
{
10557+
"ID": 2314,
10558+
"Type": 6,
10559+
"Name": "分馏塔",
10560+
"GridIndex": 0,
10561+
"IconName": "fractionator",
10562+
"WorkEnergyPerTick": 12000,
10563+
"Speed": 1.0,
10564+
"Space": 12.96
10565+
},
1046310566
{
1046410567
"ID": 2205,
1046510568
"Type": 6,
@@ -10694,6 +10797,13 @@
1069410797
"GridIndex": 1709,
1069510798
"IconName": "u-matrix"
1069610799
},
10800+
{
10801+
"ID": 1099,
10802+
"Type": 1,
10803+
"Name": "沙土",
10804+
"GridIndex": 0,
10805+
"IconName": "soil-pile"
10806+
},
1069710807
{
1069810808
"ID": 6201,
1069910809
"Type": 1,
@@ -11095,13 +11205,209 @@
1109511205
"GridIndex": 1403,
1109611206
"IconName": "尖端机械组件_新"
1109711207
},
11208+
{
11209+
"ID": 6504,
11210+
"Type": 2,
11211+
"Name": "超级机械组件",
11212+
"GridIndex": 0,
11213+
"IconName": "超级机械组件"
11214+
},
11215+
{
11216+
"ID": 6506,
11217+
"Type": 7,
11218+
"Name": "创世之书",
11219+
"GridIndex": 0,
11220+
"IconName": "创世之书"
11221+
},
11222+
{
11223+
"ID": 6507,
11224+
"Type": 7,
11225+
"Name": "虚空之书",
11226+
"GridIndex": 0,
11227+
"IconName": "虚空之书"
11228+
},
11229+
{
11230+
"ID": 6508,
11231+
"Type": 7,
11232+
"Name": "起源之书",
11233+
"GridIndex": 0,
11234+
"IconName": "起源之书"
11235+
},
1109811236
{
1109911237
"ID": 6509,
1110011238
"Type": 2,
1110111239
"Name": "空燃料棒",
1110211240
"GridIndex": 1306,
1110311241
"IconName": "空燃料棒"
1110411242
},
11243+
{
11244+
"ID": 6511,
11245+
"Type": 7,
11246+
"Name": "开发者日志01",
11247+
"GridIndex": 0,
11248+
"IconName": "日志01"
11249+
},
11250+
{
11251+
"ID": 6512,
11252+
"Type": 7,
11253+
"Name": "开发者日志02",
11254+
"GridIndex": 0,
11255+
"IconName": "日志02"
11256+
},
11257+
{
11258+
"ID": 6513,
11259+
"Type": 7,
11260+
"Name": "开发者日志03",
11261+
"GridIndex": 0,
11262+
"IconName": "日志03"
11263+
},
11264+
{
11265+
"ID": 6514,
11266+
"Type": 7,
11267+
"Name": "开发者日志04",
11268+
"GridIndex": 0,
11269+
"IconName": "日志04"
11270+
},
11271+
{
11272+
"ID": 6515,
11273+
"Type": 7,
11274+
"Name": "开发者日志05",
11275+
"GridIndex": 0,
11276+
"IconName": "日志05"
11277+
},
11278+
{
11279+
"ID": 6516,
11280+
"Type": 7,
11281+
"Name": "开发者日志06",
11282+
"GridIndex": 0,
11283+
"IconName": "日志06"
11284+
},
11285+
{
11286+
"ID": 6517,
11287+
"Type": 7,
11288+
"Name": "开发者日志07",
11289+
"GridIndex": 0,
11290+
"IconName": "日志07"
11291+
},
11292+
{
11293+
"ID": 6518,
11294+
"Type": 7,
11295+
"Name": "开发者日志08",
11296+
"GridIndex": 0,
11297+
"IconName": "日志08"
11298+
},
11299+
{
11300+
"ID": 6519,
11301+
"Type": 7,
11302+
"Name": "开发者日志09",
11303+
"GridIndex": 0,
11304+
"IconName": "日志09"
11305+
},
11306+
{
11307+
"ID": 6520,
11308+
"Type": 7,
11309+
"Name": "开发者日志10",
11310+
"GridIndex": 0,
11311+
"IconName": "日志10"
11312+
},
11313+
{
11314+
"ID": 6521,
11315+
"Type": 7,
11316+
"Name": "开发者日志11",
11317+
"GridIndex": 0,
11318+
"IconName": "日志11"
11319+
},
11320+
{
11321+
"ID": 6522,
11322+
"Type": 1,
11323+
"Name": "电力节约",
11324+
"GridIndex": 3213,
11325+
"IconName": "星球飞升-天穹巨构"
11326+
},
11327+
{
11328+
"ID": 6523,
11329+
"Type": 1,
11330+
"Name": "上传扩容",
11331+
"GridIndex": 3214,
11332+
"IconName": "星球飞升-科学枢纽"
11333+
},
11334+
{
11335+
"ID": 6524,
11336+
"Type": 1,
11337+
"Name": "燃料回收",
11338+
"GridIndex": 3113,
11339+
"IconName": "星球飞升-火力发电"
11340+
},
11341+
{
11342+
"ID": 6525,
11343+
"Type": 1,
11344+
"Name": "风力扩容",
11345+
"GridIndex": 3114,
11346+
"IconName": "星球飞升-风力发电"
11347+
},
11348+
{
11349+
"ID": 6526,
11350+
"Type": 1,
11351+
"Name": "光伏扩容",
11352+
"GridIndex": 3115,
11353+
"IconName": "星球飞升-光伏发电"
11354+
},
11355+
{
11356+
"ID": 6527,
11357+
"Type": 1,
11358+
"Name": "热聚增效",
11359+
"GridIndex": 3117,
11360+
"IconName": "星球飞升-聚变驱动"
11361+
},
11362+
{
11363+
"ID": 6528,
11364+
"Type": 1,
11365+
"Name": "资源采掘",
11366+
"GridIndex": 3215,
11367+
"IconName": "星球飞升-吞食帝国"
11368+
},
11369+
{
11370+
"ID": 6529,
11371+
"Type": 1,
11372+
"Name": "裂变增效",
11373+
"GridIndex": 3116,
11374+
"IconName": "裂变发电升级"
11375+
},
11376+
{
11377+
"ID": 6530,
11378+
"Type": 1,
11379+
"Name": "先进推进",
11380+
"GridIndex": 3216,
11381+
"IconName": "物流运输机升级"
11382+
},
11383+
{
11384+
"ID": 6531,
11385+
"Type": 1,
11386+
"Name": "特征向量模拟",
11387+
"GridIndex": 3313,
11388+
"IconName": "特征向量模拟"
11389+
},
11390+
{
11391+
"ID": 6532,
11392+
"Type": 1,
11393+
"Name": "中继信号干扰",
11394+
"GridIndex": 3314,
11395+
"IconName": "中继信号干扰"
11396+
},
11397+
{
11398+
"ID": 6533,
11399+
"Type": 1,
11400+
"Name": "神经元重编程",
11401+
"GridIndex": 3315,
11402+
"IconName": "神经元重编程"
11403+
},
11404+
{
11405+
"ID": 6534,
11406+
"Type": 1,
11407+
"Name": "异常代码分析",
11408+
"GridIndex": 3316,
11409+
"IconName": "恶意代码攻击"
11410+
},
1110511411
{
1110611412
"ID": 7002,
1110711413
"Type": 2,

0 commit comments

Comments
 (0)