442 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Unknown	dfbbad9740	Confict Resolved	2017-12-24 16:57:51 +00:00
Unknown	3bc828140a	Conflict Resolve	2017-12-24 16:54:59 +00:00
TheHeavyMachine	59a31cbb9f	Update type_10_defender.json (#15) ... The value in baseShieldStrength seems to be incorrect. MJ value displayed in coriolis (31mj) doesn't match the righ shielding value for the Type 10 stock build (99mj). After some testing "baseShieldStrength": 320, seems to work outputting the right mj value.	2017-12-24 09:54:15 +00:00
Unknown	92e4c09a61	Dear FDev, have you heard of consistant naming: PATCH	2017-12-24 09:43:28 +00:00
Unknown	78069c26e5	T10 Utility Patch	2017-12-23 12:16:41 +00:00
Unknown	cc1bfc92a2	Merge branch 'release/2.4.3'	2017-12-23 11:41:46 +00:00
Unknown	13a90a047a	Version Bump	2017-12-23 11:41:07 +00:00
Unknown	6bb856bee7	Type 10	2017-12-23 11:39:23 +00:00
Unknown	8ee1c3c70b	Merge branch 'release/2.4.2' into develop	2017-11-09 16:56:52 +00:00
Unknown	f73a6c1e8a	Merge branch 'release/2.4.2' 2.4.2	2017-11-09 16:56:15 +00:00
Unknown	1c8416889a	Changelog and Versions	2017-11-09 16:54:43 +00:00
Unknown	a45deed60c	Dist Files	2017-11-09 16:52:59 +00:00
Unknown	85d6157beb	Merge branch 'feature/ship-purchase-requirements' into develop	2017-11-09 16:48:55 +00:00
Unknown	54c92ab9ff	Merge branch 'hotfix/repair-limpet' into develop	2017-11-09 16:43:09 +00:00
Joseph Stader	d171ff0002	"Fix" bug with long IDs for repair limpet controllers on build load	2017-11-09 00:07:48 -05:00
Joshua Campbell	a89b4ae3c9	Add purchase requirement info to ships	2017-11-07 01:37:11 -05:00
Unknown	dc35ed80e9	Merge branch 'develop'	2017-10-31 17:01:05 +00:00
Unknown	7863330106	Bumps	2017-10-31 17:00:00 +00:00
William	f9420dfaeb	fix repair limpet controller crash (#11) ... fix repair limpet controller crash	2017-10-12 08:41:32 +01:00
Unknown	792b0e6c5e	Merge branch 'release/2.4.0' into develop	2017-10-10 16:41:11 +01:00
Unknown	bbb39a6e27	Merge branch 'release/2.4.0' 2.4.0	2017-10-10 16:40:23 +01:00
Unknown	0c4a66f19f	Dist Files	2017-10-10 16:39:58 +01:00
Unknown	34459e6825	Changelog	2017-10-10 16:39:02 +01:00
Unknown	1e4ba33583	Bump Version	2017-10-10 16:38:16 +01:00
Unknown	8ffc685047	Repair Limpets	2017-10-03 20:23:36 +01:00
Unknown	64d5577e4e	Remove Long Range from FC	2017-09-01 22:43:26 +01:00
Unknown	d8b56952f0	Fix 5A FSD Integrity	2017-09-01 22:39:55 +01:00
Unknown	5a8578c043	Merge branch 'master' into develop	2017-08-29 19:59:09 +01:00
Unknown	0ba60d2993	Merge branch 'release/2.3.7' 2.3.7	2017-08-29 19:58:36 +01:00
Unknown	b3fd528ad1	Bump Version ... Bump version and generate dist.	2017-08-29 19:58:04 +01:00
strideynet	1de49ec2f2	Update MLF	2017-08-17 15:20:20 +01:00
Cmdr McDonald	74d3a43bc7	Merge branch 'release/2.3.6' into develop	2017-06-24 09:30:33 +01:00
Cmdr McDonald	51d011da76	Merge branch 'release/2.3.6' 2.3.6	2017-06-24 09:30:28 +01:00
Cmdr McDonald	ed34cccf54	Version bump	2017-06-24 09:30:24 +01:00
Cmdr McDonald	87603e4466	Add shot speed to relevant kinetics	2017-06-24 09:29:39 +01:00
Cmdr McDonald	8b92dfbf10	Merge branch 'release/2.3.5' into develop	2017-05-17 07:30:36 +01:00
Cmdr McDonald	f8faf11e3c	Merge branch 'release/2.3.5' 2.3.5	2017-05-17 07:30:32 +01:00
Cmdr McDonald	c029ed0e0d	Version bump	2017-05-17 07:30:26 +01:00
Cmdr McDonald	5570c66010	Fix typo	2017-05-15 16:07:24 +01:00
Cmdr McDonald	0af85f4d31	Fixes	2017-05-15 10:11:58 +01:00
Cmdr McDonald	3597ae4093	Add shot speed for long-range weapon	2017-05-12 00:29:38 +01:00
Cmdr McDonald	662efeaace	Fix integrity for class 6 power plants	2017-05-07 10:23:50 +01:00
Cmdr McDonald	8250994ebe	Fix blueprints for point defence	2017-05-06 10:29:10 +01:00
Cmdr McDonald	ba08e5184f	Add values for FSD interrupt	2017-05-03 14:33:06 +01:00
Cmdr McDonald	839b9b80a9	Merge branch 'release/2.3.4' into develop	2017-05-03 12:38:42 +01:00
Cmdr McDonald	f11ce05c03	Merge branch 'release/2.3.4' 2.3.4	2017-05-03 12:38:39 +01:00
Cmdr McDonald	355d2ef88d	Version bump	2017-05-03 12:38:32 +01:00
Cmdr McDonald	6a5817237d	Separate specials for dumbfire and seeker missiles	2017-05-03 10:15:54 +01:00
Cmdr McDonald	9825474117	Add FSD interrupt special	2017-05-03 09:57:56 +01:00
Cmdr McDonald	64b7ca503a	Fix internal names for power plant blueprints	2017-04-27 06:59:06 -04:00