craftingguide/website
1
0
Fork 0
Code Pull Requests Actions Activity
485 Commits 7 Branches 0 Tags
d13d34fc2486ab56562bb203deefe0bb564ef200
Commit Graph
485 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Miner a453712409 Fix bug causing /item/null URLs 2014-12-28 17:39:56 -08:00
Andrew Miner 2ffd6274b7 Update deploy to use new S3 setup 2014-12-28 17:35:58 -08:00
Andrew Miner bf113d26ab Update URL scheme to include /item/* 
* Update the router to understand /item/:name routes in addition to
  v1.0-style parameterized routes
* Add support for updating the current URL based upon the item being
  viewed
* Change LandingPage* to ItemPage*
 2014-12-28 12:59:29 -08:00
Andrew Miner 8cde02a10b Update test server to use Express 2014-12-28 12:58:53 -08:00
Andrew Miner ef1e9816c1 Enable client-side source maps for CoffeeScript 2014-12-28 12:58:32 -08:00
Andrew Miner a3723dd667 Recognize CraftingGuide 1.0 query parameters 2014-12-27 19:15:20 -08:00
Andrew Miner 03d8f84a0d Add auto-complete drop-down for crafting selection 2014-12-26 14:02:27 -08:00
Andrew Miner 0d2e175410 Add jQuery-UI as a dependency 2014-12-26 14:01:57 -08:00
Andrew Miner 1a84ce2e28 Complete basic crafting functionality 2014-12-24 19:17:37 -08:00
Andrew Miner 3ea6a845c7 Fix bug where tools status was not in recalculate 2014-12-23 20:32:50 -08:00
Andrew Miner 95c15abe10 Added CraftingTable* components and UI 2014-12-23 20:26:36 -08:00
Andrew Miner b05fc4c5c9 Complete the RecipeBook controller 2014-12-23 09:12:02 -08:00
Andrew Miner 9fc0407fe4 Remove "dist" directory (only for build products) 2014-12-22 16:44:55 -08:00
Andrew Miner 16832e02dd Step 1 in converting to a Backbone-based website 2014-12-22 16:36:04 -08:00
Andrew Miner dc9fd0de07 Update code to load recipe books synchronously 2014-11-02 21:00:18 -08:00
Andrew Miner 814c2b7c39 Update deploy script to work with S3 2014-11-02 20:44:17 -08:00
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