Commit Graph
869 Commits
Author SHA1 Message Date
Andrew Miner e4d7e8b883 Merge pull request #41 from MCE626/patch-1
Create more_blocks.json
2014-11-02 20:43:40 -08:00
Andrew Miner f08855b339 Added gravisuite.json provided by flotschi301 2014-11-02 13:27:01 -08:00
Steve 4c981cbcb6 Create more_blocks.json 2014-10-05 18:27:33 -05:00
Andrew Miner ec696aea9a Merge pull request #40 from whizzball1/patch-7
Thermal Expansion, finished all recipes
2013-10-14 07:28:34 -07:00
whizzball1 be8d2cefe1 Added listing for Thermal Expansion 2013-10-10 16:26:37 -07:00
whizzball1 c4dfebf789 Finished Thermal Expansion (yay!) 2013-10-10 16:24:20 -07:00
Andrew Miner b6497e3d7c Merge pull request #39 from judos/master
added Applied Energetics rv12-b
2013-10-09 19:39:57 -07:00
judos 0afadc836a corrected recipies
-added Assembly Table and Laser for 2 recipies
2013-10-08 20:06:41 +02:00
judos e1ecc630c9 fixed all comments andrewminer wrote on prev commit
-2 new recipies
-removed tab and inserted 4 spaces instead
-removed crafting table for tiny tnt
-removed buildcraft recipie
2013-10-07 13:01:41 +02:00
judos ffb4274c23 added Applied Energetics rv12-b
I am unsure about:
- Recipies that offer you choice (e.g. use Nether Quartz or Certus
Quartz), eventually this has to be considered
2013-10-01 13:59:22 +02:00
Andrew Miner bf85b6f4a7 Add Static Boots to IC2 recipes 2013-09-04 09:06:42 -07:00
Andrew Miner 3ae83f5986 Fix Composite Vest recipe for IC2 2013-09-04 08:21:06 -07:00
Andrew Miner 0cb0ae8800 Add CF Pack receipe to IC2 2013-09-04 08:09:52 -07:00
Andrew Miner 8afdc01bd7 Fix recipe for Quantum Helmet 2013-09-03 08:54:54 -07:00
Andrew Miner a33697b7b4 Avoid cycle by removing Wool from String recipe
* The crafting algorithm isn't quite smart enough yet to detect cycles, so
  adding recipes like String -> Wool and Wool -> String will cause infinite
  loops.  So, for now, I'm removing such recipes until the algorithm is fixed.
2013-09-03 00:11:58 -07:00
Andrew Miner b7645267f0 Merge pull request #37 from whizzball1/patch-6
Thermal Expansion, added all the Machines.
2013-09-03 00:09:05 -07:00
Andrew Miner 40c7b7a59a Merge branch 'ZL123-recipes'
Conflicts:
	html/data/vanilla.json
2013-09-03 00:03:56 -07:00
Andrew Miner 5f59fdab6c Correct added vanilla recipes from ZL123 2013-09-03 00:00:33 -07:00
Andrew Miner af7fa853b0 Re-add tools to crafting calculation 2013-09-02 14:38:11 -07:00
Andrew Miner aae80c0bf1 Re-connect user inventory to crafting 2013-09-02 12:30:58 -07:00
Andrew Miner f89de8abd8 [#13, #23] Add support for alternate recipes
* Added support for determining all the possibly ways to create a given item
* Added full unit test support
2013-09-02 12:24:08 -07:00
Andrew Miner 813f7a0c2e Fixed recipe for Nuclear Reactor 2013-09-01 00:18:00 -07:00
Andrew Miner 9f413d54dc Fix mis-spelling in IC2 recipe 2013-08-30 00:44:05 -07:00
Andrew Miner 28480ebe18 Finished IC2 recipes 2013-08-29 23:39:23 -07:00
Andrew Miner 3f54f7a3aa Add nuclear reactor component recipes 2013-08-28 23:05:15 -07:00
whizzball1 cf757020e4 Fixed the periods on 34 and 70.
The commit is ready to be pushed.
2013-08-23 08:11:17 -07:00
Andrew Miner 871fcf852b Convert crafting output lists to tables 2013-08-22 23:51:28 -07:00
Andrew Miner f8eed010d5 Added all the "Machines" recipes for IC2 2013-08-22 22:15:22 -07:00
whizzball1 1d3a5a2eb3 Thermal Expansion, added all the Machines.
All the Machines have been added. Next I'll be working on Engines and Transport.
2013-08-22 10:27:10 -07:00
Andrew Miner 58f0c5677d Merge pull request #36 from whizzball1/patch-5
Added Bricks (block)
2013-08-22 09:33:22 -07:00
whizzball1 9e2ab596c4 Added Bricks (block)
Didn't call it Bricks (block) because they have two different names, brick for the single and bricks for the block.
2013-08-22 08:03:46 -07:00
Andrew Miner 32e2a8a1ee [#1] Add inventory and update calc's to use it 2013-08-21 22:24:14 -07:00
Andrew Miner 79c55a2120 Merge pull request #33 from whizzball1/patch-1
Created Thermal Expansion
2013-08-21 21:08:50 -07:00
Andrew Miner 07d147a455 [#31] Upgrade recipe selector to support search
* Add the jQuery-UI autocomplete component instead of a regular select control
  for choosing recipes
2013-08-21 20:30:56 -07:00
whizzball1 c1e88a8f26 Created Thermal Expansion
Barebones, includes only crafting table and furnace-able items.
Contains Copper Gear, Electrum Blend, Electrum Ingot, Machine Frame, Pneumatic Servo, Redstone Conductance Coil, Redstone Reception Coil, Redstone Transmission Coil, Tin Gear.
2013-08-21 09:01:32 -07:00
Andrew Miner 56421ab074 Remove toolsIncluded URL parameter 2013-08-21 01:04:48 -07:00
ZL123 026fef522a Added a bunch more vanilla recipes, including Chain Armor, because why not? 2013-08-21 14:32:27 +08:00
Andrew Miner ab3321ce86 [#25] Add "include tools" selector 2013-08-20 19:36:48 -07:00
Andrew Miner 7b239580c1 Merge pull request #27 from ZL123/master
Added recipes for Beacon, TNT, and Buttons.
2013-08-20 19:09:16 -07:00
ZL123 4590263a93 Added recipes for Beacon, TNT, and Buttons. 2013-08-21 10:01:11 +08:00
Andrew Miner a9e699087e Merge pull request #26 from whizzball1/patch-1
Added Silver Ingot Recipe
2013-08-20 16:10:17 -07:00
whizzball1 55db41f27b Added Silver Ingot Recipe
Silver Ore and 125 milli-coal makes Silver Ingot with a Furnace.
Recipe made for use in my Thermal Expansion Recipe Book.
2013-08-20 23:31:34 +01:00
Andrew Miner ee52b06753 Move wordmark to correct file name 2013-08-20 08:11:11 -07:00
Andrew Miner 2828c52127 Add more IC2 recipes / add workmark 2013-08-20 08:10:07 -07:00
Andrew Miner ba83e8d205 [#14] Add list of crafted items
* This is step toward implementing #14 in that it shows you a list of the items
  which need to be crafted.  However, it still doesn't show you the steps and
  proper order in which to craft everything.
2013-08-19 23:05:26 -07:00
Andrew Miner 87c6664363 Added "Energy and Wiring" items for IC2 2013-08-19 19:49:41 -07:00
Andrew Miner 214cce6c4f [#19] Sort recipe names within each optgroup 2013-08-19 19:21:05 -07:00
Andrew Miner db0605095f Fix bug with previous change 2013-08-19 18:11:11 -07:00
Andrew Miner 0dbf775f35 [#22] Change page url when changing item
* Update page title when changing items
* Update page URL to reflect proper url when changing items
* Send another pageview to Google Analytics after changing the page
2013-08-19 18:05:44 -07:00
Andrew Miner 50fdab3ff1 Added a partial recipe book for IC2
* Added some missing recipes for the vanilla recipe book
2013-08-19 00:52:54 -07:00