Commit Graph
34 Commits
Author SHA1 Message Date
MysteriousAges 7aba3f5f53 Some refactoring; work on some initial hive blocks. 2013-05-19 14:53:27 -07:00
MysteriousAges 5f9b122d77 Some polishing, registering all the items with Forge because RG asked for it. *worry* 2013-05-13 13:11:34 -07:00
MysteriousAges 092c076dba Work on the Effect jar, which is finally done! \o/ 2013-05-06 00:24:06 -07:00
MysteriousAges ebb8298c9d Merge branch 'master' into EffectJar
Conflicts:
	thaumicbees_src/thaumicbees/main/Config.java
	thaumicbees_src/thaumicbees/main/ThaumicBees.java
2013-05-01 12:06:48 -07:00
MysteriousAges 62b7d28020 Adding Apatite bees.
Mutation class supports block requirements beneath the apiary. Can use blockId/blockId & meta/ore dictionary entry.
Added Ars Magica recipe for Concentrated compound.
2013-04-28 22:11:56 -07:00
MysteriousAges e5ae2527a9 Many Ars Magica bees! 2013-04-25 20:38:45 -07:00
MysteriousAges aca8b2dcb1 Fixing some texture misses, eliminating dead/useless code that throws errors and dead/useless code that does not throw errors
Starting Ars Magica integration.
New Skulking family sprite. Enjoy nightmares.
2013-04-24 15:43:23 -07:00
MysteriousAges 88ec668999 *tableflip* 2013-04-22 16:03:27 -07:00
MysteriousAges 9729d75252 Work on Effect jar;
Fixing TC3 integration on 1.5
2013-04-21 15:38:52 -07:00
MysteriousAges b2d18fbb64 Moon dial
Creative tab
2013-04-15 02:27:33 -07:00
MysteriousAges 96389b5329 Port to 1.5.1! Woooo! 2013-04-15 00:17:50 -07:00
MysteriousAges e8421f40fe New bees, EE3 "integration". Nuggets, Frames. 2013-04-11 23:08:17 -07:00
MysteriousAges b8d12b1f9a Lots of new bees, pulling out most dependencies on Thaumcraft 3 into helper; making it possible to run without. 2013-04-11 02:40:25 -07:00
MysteriousAges 89fb41b814 Flammability configuration option; start of effect jar 2013-03-28 09:21:00 -07:00
MysteriousAges f44591b47d Removing Apiary junk FOREVERZ. (Not really; moved to branch.)
Purify + Node growth? Fuck you. You die here.
2013-03-26 00:00:58 -07:00
MysteriousAges 721a60c994 Holy fuck that was a mess. 2013-03-06 20:44:06 -08:00
MysteriousAges 4a03a5f48c Revert "Merge branch 'machineDev' of https://bitbucket.org/MysteriousAges/thaumicbees into machineDev"
This reverts commit c6720b7417, reversing
changes made to 575c799587.
2013-03-06 19:44:01 -08:00
MysteriousAges 2c2306b223 Adding aspects for Extra Bees items
Adding support for remote version checking! Wahoo!
2013-03-05 00:57:31 -08:00
MysteriousAges e32c05ab3e Merge branch 'machineDev'
Conflicts:
	thaumicbees_src/thaumicbees/main/Config.java

Deleting block classes from this branch, because GO AWAY.
2013-03-04 13:18:15 -08:00
MysteriousAges f21bd467c2 Uncommenting blocks in Config. 2013-03-04 13:10:21 -08:00
MysteriousAges e92d9c131e Merge from master. 2013-03-04 13:04:21 -08:00
MysteriousAges 85a2723ef8 Checkin before moving Apiary stuff to branch. 2013-03-04 13:02:15 -08:00
MysteriousAges 29069e7e9f Grafter & Scoop~! 2013-03-03 23:50:29 -08:00
MysteriousAges c8be483bf0 Merge branch 'master' of bitbucket.org:MysteriousAges/thaumicbees
Conflicts:
	thaumicbees_src/thaumicbees/main/Config.java
2013-02-27 19:29:18 -08:00
MysteriousAges 92ace4e9a3 Scoop work. 2013-02-27 17:49:32 -08:00
MysteriousAges aed979a19f dev 2013-02-26 17:56:57 -08:00
MysteriousAges 0fa9a6ed23 New capsule, more refactoring. More research. More config options for capsule stack size 2013-02-22 16:14:17 -08:00
MysteriousAges 5eb787352b Planks & Refactoring. 2013-02-18 12:13:31 -08:00
MysteriousAges a7774e1fca Loc problems getting fixed. 2013-02-15 13:00:30 -08:00
MysteriousAges 902812e015 Starting Localization! Yaaaaaaaaaay 2013-02-12 17:21:29 -08:00
MysteriousAges 0b510e8426 Tweaking the flux & purify bee effect
Commenting out Magic Apiary blocks for a release version.
2013-02-12 13:40:18 -08:00
MysteriousAges 5a2f360e50 Another FC build.
*Heavily refactored bee code. Much cleaner now I think.
*Temporal bee branch complete, now with more Doctor Who!
2013-02-09 14:12:43 -08:00
MysteriousAges 84ad8b0d7b Lots of work... None of it actually on machines. 2013-02-06 00:33:51 -08:00
MysteriousAges 6a26bec4e1 Fucktons of refactoring.
*Moving ItemManager & BlockManager functionality into Config object.
*New CraftingManager to hold all the crafting stuff
*Shuffling some classes around in packages and whatnot.
*Switching to use the ItemInterface provided by Thaumcraft's API rather than reading configs.
*New texture stuff for a magic apiary.
2013-02-05 01:16:01 -08:00