upstream/MagicBees
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/MagicBees.git synced 2026-11-12 00:08:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
264 Commits 3 Branches 94 Tags
2.2.3
Commit Graph
264 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
MysteriousAges 319682ae2b Cleaning up crashy statements that rely on API classes being present. 2.2.3 2015-04-20 23:24:20 -07:00
MysteriousAges c8f20bd513 Merge pull request #40 from ibmibmibm/master 
Update zh_TW.lang

Thanks for your work! (:
 2015-04-20 21:42:33 -07:00
MysteriousAges 6f6823b6d2 Adding Botania lexicon entries & crafting recipes for Beegonia & Hiveacynth. 2015-04-20 21:37:49 -07:00
MysteriousAges a65c593c9a Adding Hiveacynth, with several configuration options. 2015-04-20 19:54:00 -07:00
MysteriousAges 55840ac08e Adding Beegonia subtile. 2015-04-20 17:36:55 -07:00
MysteriousAges a7076ce817 Add back the version checker; pings Github now. 
Fix NPE on init.
 2015-04-19 23:43:37 -07:00
MysteriousAges e5e6474ff9 Adding version check file. 2015-04-19 22:15:48 -07:00
MysteriousAges 1703e8a862 Update load order dependencies. 2015-04-19 15:27:09 -07:00
MysteriousAges b16524e919 Start on Botania integration. 2015-04-19 15:26:40 -07:00
MysteriousAges d8cd023876 Adding BotaniaHelper for future reasons. 2015-04-19 14:17:09 -07:00
MysteriousAges d64ec3caa2 Merge branch 'master' of github.com:MagicBees/MagicBees 
Conflicts:
	src/api/java/thaumcraft/api
 2015-04-19 13:57:39 -07:00
MysteriousAges 515e0e1751 Once more, with feeling. 2015-04-19 13:56:38 -07:00
MysteriousAges cc9bbefa3f Update README.md 2015-04-19 13:19:46 -07:00
MysteriousAges 18c7790abd Moving Thaumcraft api submodule to the "correct" location. 
Adding Blood Magic deobf jar to libs folder for ease of building.
Adding Botania deobf jar to libs folder for ease of building.
rev++
 2015-04-19 13:14:29 -07:00
Shen-Ta Hsieh ccbfa4995d Update zh_TW.lang 2015-04-18 16:58:13 +08:00
MysteriousAges 54faf63bab Moved postInit block/item queries for mods to init to try avoiding bee mutation NPEs. 2015-04-13 17:49:26 -07:00
MysteriousAges e14bbe254a Changed bee init to Mod init, from post. Fixes #17. 2015-04-13 09:16:31 -07:00
MysteriousAges 50d914e846 Changed tool registration on Thaumium grafter & scoop. Fixes #34 2015-04-13 09:10:42 -07:00
MysteriousAges 3b8dec5425 Cleaning up misplaced modname references. 
Incrementing build number.
 2015-04-12 15:42:47 -07:00
MysteriousAges a332d3f2e5 Removing Forestry interfaces from @Optional. Fixes #35 2015-04-12 15:24:35 -07:00
MysteriousAges d921717965 Merge branch 'thaumicApiary-dev' 
Conflicts:
	gradle.properties
 2015-04-12 14:45:19 -07:00
MysteriousAges 55f9e58297 Converted Russian loc file to UTF-8 from something else. Fixes #33 2015-03-31 14:15:20 -07:00
MysteriousAges 7930108032 Bump version number for release build. 2015-03-29 21:24:49 -07:00
mezz 0fd8b319de Fix apiary not retaining AuraCharge state 2015-03-28 02:51:41 -07:00
MysteriousAges 051cc96514 Research notes for Vis Aura provider, TC crafting & garbage. 
Apiary logic tweaks.
 2015-03-27 22:35:33 -07:00
MysteriousAges 40fdbb29c6 Finalize Vis Apiary Booster crafting recipe. 
Better IMagicApiaryAuraProvider search algorithm.
Reformat ThaumcraftHelper; removed old method, Add enums for wooden & metal TC devices.
 2015-03-27 16:31:15 -07:00
MysteriousAges 52798c8175 Vis aura provider rendering! 
Rename EfectJarRenderer to RendererEffectJar.
 2015-03-26 22:19:40 -07:00
MysteriousAges a5fed5c9b7 Change Apiary to query chunks for IAuraProvider directly without going through the world object. 2015-03-26 13:57:29 -07:00
MysteriousAges 07624a3a4c Change HiveType to check spawn location to see if occupant bees can actually work in the biome, and not spawn if they cannot. 2015-03-26 13:05:15 -07:00
MysteriousAges dc4cd3331c Removing unnessecary try/catch from thaumium tools; moving to item init. 2015-03-24 16:18:10 -07:00
MysteriousAges 6ea6f1e017 Adding temporary crafting recipes for Magic Apiary & vis aura converter. 2015-03-21 21:26:51 -07:00
MysteriousAges cb7b515626 Added network event for updating bit flags. 
Magic Apiary pulls charges from Aura Providers.
 2015-03-21 20:45:36 -07:00
MysteriousAges 46cb2cb95a Add VisAuraProvider. Placeholder texture, placeholder name, placeholder EVERYTHING. 
Add crude search mechanism for Aura Providers to Magic Apiary.
 2015-03-21 18:20:45 -07:00
MysteriousAges cc987d6ac8 Renaming Thaumic Apiary to Magic Apiary. 2015-03-20 16:52:42 -07:00
MysteriousAges 4f39132e4e Adjusting lifebar locations in Apiary GUI. 2015-03-19 14:02:43 -07:00
MysteriousAges 4938c29e8c Deleting reference package. Not needed. 
Moving Apiary config location - not Thaumcraft specific.
Adding ItemStackUtils - generic item stack/inventory functions.
Thaumic Apiary has baseline functionality. Bees work in it.
 2015-03-19 13:51:41 -07:00
MysteriousAges cbb0b15dee Adding network packet stuff. 2015-03-18 23:53:22 -07:00
MysteriousAges b881283492 Updating GUI texture. 2015-03-18 23:52:55 -07:00
MysteriousAges 5d4b84727d Work on Thaumic Apiary. Creating Packet Handler for sending network events (ie queen item stack changes) 
Tweaking textures on thaumic apiary again
Adding MORE crap to gitignore
build.gradle missing a runDir argument, apparently.
 2015-03-17 23:03:48 -07:00
MysteriousAges ad9135590d Starting to flesh out Thaumic Apiary. 2015-03-15 01:06:14 -07:00
MysteriousAges 5cd884929f Moving the thaumcraft submodule to a place where Eclipse won't bitch me out about it. @_@ 
Added the 'mods/' folder to gitignore. Don't need that stuff in the repo, kthxbai
 2015-03-15 00:45:43 -07:00
MysteriousAges 7bd5e7ac54 Refactoring Effect Jar code a bit. 2015-03-14 15:39:05 -07:00
MysteriousAges 8cda9b9f43 Hazardifying Thaumic Apiary GUI. 2015-03-14 15:38:37 -07:00
MysteriousAges 444303d06d Hazardifying apiary textures. 
Deleting unused greatwood & silverwood plank textures.
 2015-03-14 15:22:07 -07:00
MysteriousAges b3ca22fd1f Administrative cleanup stuff. Whee. 2015-03-14 15:11:35 -07:00
MysteriousAges 1f8f324c56 Kicking Thaumcraft API out into submodule. You'll have to update submodules to build from now on. (Easier than trying to keep a damned jar up to date manually) 
Brushing up build.gradle and creating gradle.properties to manage mod version & version dependencies.
Disabling mod version check for now - Dropbox file has been inaccessible for the better part of a year. (Thanks, dropbox.)
Nuking build version in VersionInfo.java - not used for anything; not useful.
 2015-03-14 15:06:01 -07:00
MysteriousAges 3d1cdfa9af Adding BS files to gitignore. 2015-03-14 14:00:07 -07:00
MysteriousAges 1275abc1c4 Cleaning up Config.java some. 2015-03-14 13:59:24 -07:00
Arkandos 3347afb0c3 Update imports to unstable forestry 2015-01-16 22:59:06 +01:00
Arkandos 016049ef67 Merge my branch into the main one, initial work on the thaumic apiary 
Might have messed something up. Not quite sure
 2015-01-16 22:06:02 +01:00