upstream/MagicBees
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/MagicBees.git synced 2026-11-12 08:17:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
187 Commits 3 Branches 94 Tags
ffe3f9d33e5e4e27ede0482a4fe668e77fdfbea0
Commit Graph
187 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Arkandos ffe3f9d33e Updated to Tarig0s Language files 2014-08-23 01:34:02 +02:00
Arkandos 0e0eaac495 Fixes. 
Upped forge to latest.
Now requires Forestry 3.
Hopefully fixed Thaumcraft and ExtraBees integration
 2014-08-23 00:33:46 +02:00
Arkandos e9c423579b Seems good. Merging 
Merged in Tarig0/magic-bees-1/Tarig0/add-forestry-maven-repo-1408309659498 (pull request #1)

Add forestry maven repo
 2014-08-17 23:15:49 +02:00
Tarig0 1be990eb0e Add forestry maven repo 2014-08-17 21:07:42 +00:00
Arkandos 87a918b7c6 Centrifuge fixes 
Released version 2.1.18
 2014-08-17 19:51:35 +02:00
Arkandos 580f1f4e12 Bugfixes and Modularization 
Fixed several crashes due to ThermalExpansion splitting into Thermal
Foundation.
Also added config options to disable modinteraction with other mods.
 2014-08-11 14:09:15 +02:00
Arkandos 2b0b729ad0 Started work on BloodMagic bees 
Created 2 very basic, BM bees.
Also fixed a crash when trying to get nuggets from an ingot.
Also removed some unneeded nuggets.
 2014-08-04 01:28:57 +02:00
Arkandos f5a6ca61ba Started work on Bloodmagic Bees 
Implemented BloodMagicHelper to interface with bloodmagic
 2014-08-02 18:55:38 +02:00
Arkandos 44ecbbdc45 Implemented config gui 
Just implemented a simple config gui. Will try to refine this later
 2014-08-01 19:28:34 +02:00
Arkandos d3c6ad5433 1.7.10 Port 
Initial 1.7.10 Port. Everything seems to be working, but can't be tested
without access to Thaumcraft.
Got rid of Forestrys Item/BlockInterfaces and created my own.
Started to use @Optional.Interface
Implemented @Pahimar s LogHelper to deal with log4j
Changed localization system to use the vanilla one
 2014-08-01 04:05:49 +02:00
MysteriousAges 5b053dd990 Merged in Vexatos/magic-bees-1/Vexatos/en_usxml-edited-removed-german-species-n-1398711730720 (pull request #6) 
en_US.xml edited, removed German species names
 2014-04-28 12:11:40 -07:00
Vexatos e416d09dde en_US.xml edited, removed German species names 2014-04-28 19:03:16 +00:00
MysteriousAges 723506d04f Merged in Vexatos/magic-bees (pull request #5) 
Update de_DE.xml, removed duped entry from en_US
 2014-04-28 11:55:37 -07:00
Vexatos c352b42fc1 Update de_DE.xml, removed duped entry from en_US 2014-04-22 10:18:50 +02:00
MysteriousAges 95275e57d6 Merged in Minalien/magic-bees (pull request #4) 
Upgraded to 1.7.2.
 2014-04-08 16:48:24 -07:00
Ken 'Minalien' Murray 02659b2816 Upgraded to 1.7.2. List of currently-known issues are in CURRENT_ISSUES.txt file. 2014-04-08 12:39:01 -07:00
MysteriousAges 02655f092e Tagging MB with license info 2014-01-24 03:00:08 +00:00
MysteriousAges 03bc6c0d83 Fixing WorldGeneratorHandler.java 'cause oops. 2014-01-21 14:00:32 -08:00
MysteriousAges 85f8ab960d Tidying up from merge some 
Switching hivegen to respect isGenMineableReplaceable for crazy mods like underground biomes.
 2014-01-18 12:44:14 -08:00
MysteriousAges 2146249b9c Cleaning up code from TE merge 2014-01-16 13:51:51 -08:00
MysteriousAges a4ebd6d859 Merged in jadedcat/magic-bees-jc (pull request #3) 
Thermal Expansion and Redstone Arsenal Bees
 2014-01-16 12:35:07 -08:00
jadedcat 6c79dfb104 Thermal Expansion and Redstone Arsenal Bees 2014-01-16 14:31:09 -06:00
MysteriousAges 9233d45b33 Revert "Merged in kieranmenor/magic-bees (pull request #1)" 
This reverts commit 7082436190, reversing
changes made to fb8873b781.
 2014-01-16 12:13:00 -08:00
MysteriousAges 7082436190 Merged in kieranmenor/magic-bees (pull request #1) 
Conflicts:
	magicbees_src/magicbees/world/feature/FeatureHive.java
 2014-01-15 18:45:50 -08:00
MysteriousAges fb8873b781 Build. 2014-01-12 17:11:25 -08:00
MysteriousAges 12c1b3b5c3 (Possibly) fixing busted AM2 mob spawns. 2013-12-27 13:35:59 -08:00
MysteriousAges ecaa9babf7 TCons renamed their aluminum ore. -_- 2013-12-27 13:35:40 -08:00
MysteriousAges 16086558e4 Fixes to fluids. 2013-12-18 15:34:35 -08:00
MysteriousAges cc4390ec21 Fluid name updates 2013-12-18 13:44:42 -08:00
MysteriousAges 0cb6505fd4 build nonsense 2013-12-18 12:53:07 -08:00
MysteriousAges 52128123ef Shadow on tempus aspect 
Config option to switch off otherworld hives spawning in magic biomes.
 2013-12-17 11:41:23 -08:00
MysteriousAges 6136a59a15 Tweaks and things. 2013-11-02 13:24:45 -07:00
MysteriousAges 0886fd1389 Build script updates 
Changing recipe of Dimensional Singularity to make it less painful.
 2013-10-20 23:15:49 -07:00
MysteriousAges ea409d34de Hive frames are not enchantable. (Enchants never did anything anyway.) 
Adjusting hive spawn code.
 2013-10-10 23:39:04 -07:00
Kieran Menor 1f7fe61afe Rewrote most of the hive spawn logic. Spawn chances for each hive are defined in HiveType.initHiveData() for each biome type. 
It builds. Not tested in Minecraft due to lack of 1.6.2 setup.
 2013-10-08 02:17:54 +02:00
MysteriousAges 1cb45e24c5 Build script changes for jenkins. 2013-10-06 22:28:56 -07:00
MysteriousAges 7ab175d8b6 Block update message. Guessing 0 people are going to see this, but whatever. 2013-10-06 21:18:50 -07:00
MysteriousAges 31ff948c6d Cleaning up some old commented crap. 2013-10-06 12:26:24 -07:00
MysteriousAges fa2590d41e Fixes. 2013-09-29 19:41:16 -07:00
MysteriousAges 0e77348285 Shit. It's going into the repo. 2013-09-25 21:21:03 -07:00
MysteriousAges 608656be73 Refactoring resource locations to reference CommonProxy.DOMAIN. 
Adding the Mysterious Magnet.
 2013-09-17 19:40:26 -07:00
MysteriousAges 58c56623af Fixing indentation. (Remind me to not use Eclipse to edit these.) 2013-09-16 10:05:40 -07:00
MysteriousAges f05c12b2ee Holy shit, all the research! 
Also, some new stuff. @_@
 2013-09-16 00:30:40 -07:00
MysteriousAges 4b802d4727 + Mutating essence 
Renaming other essences to shorter forms
 2013-09-15 20:47:56 -07:00
MysteriousAges ffd6f2ca94 TC4 & AM2 integration progress! <3 2013-09-12 19:33:08 -07:00
MysteriousAges c309c20268 Seriously Thaumcraft? WTF. 
Fixing logic error in Railcraft transmutation effect logic.
 2013-09-10 15:24:52 -07:00
MysteriousAges 3d75e97b20 Shit, I did it again. 
Cleaning up old TC3 stuff, preparing to try integrating TC4.
Cleaning up helper stuff so it is more consistent & straightforward.
 2013-09-09 23:23:00 -07:00
MysteriousAges e23ebd1011 Pulling forward some changes to 1.5 2013-09-04 21:07:04 -07:00
MysteriousAges 707a9bd64e Fixing disable check. 2013-09-04 21:02:36 -07:00
MysteriousAges 6c567e247a Deactivating TC3 integration. 
Fixing bad animated textures.
 2013-09-04 20:44:03 -07:00