Commit Graph

Select branches

Hide Pull Requests

empowering-chunk-fix

master

mu

release/2.9.x

#1

#10

#11

#12

#13

#14

#15

#16

#17

#18

#19

#2

#20

#21

#22

#23

#24

#25

#26

#27

#28

#29

#3

#30

#31

#32

#33

#34

#35

#36

#37

#38

#39

#4

#40

#41

#42

#43

#44

#45

#46

#47

#48

#49

#5

#50

#51

#52

#53

#54

#55

#56

#57

#58

#59

#6

#60

#61

#62

#63

#64

#65

#66

#67

#68

#68/merge

#69

#7

#70

#71

#71/merge

#8

#9

0.9.0

1.0.701

1.1.702

1.2.705

1.3.0

1.3.0a

1.3.0b

1.3.0c

1.3.0d

1.4.0

1.4.2

1.4.3

1.4.3a

1.4.3b

1.4.3c

1.4.4

1.4.4b

1.4.5

1.4.5a

1.4.6

1.4.7

2.0.5

2.1.0

2.10.0-GTNH

2.10.1-GTNH-pre

2.10.10-GTNH

2.10.11-GTNH

2.10.12-GTNH

2.10.13-GTNH

2.10.14-GTNH

2.10.2-GTNH

2.10.3-GTNH-pre

2.10.4-GTNH

2.10.5-GTNH

2.10.6-GTNH

2.10.7-GTNH

2.10.8-GTNH

2.10.9-GTNH

2.11.0-GTNH

2.11.1-GTNH

2.2.3

2.4.1

2.4.2

2.5.0

2.5.10-GTNH

2.5.11-GTNH

2.5.12-GTNH

2.5.13-GTNH

2.5.14-GTNH

2.5.15-GTNH

2.5.16-GTNH

2.5.2

2.5.2-GTNH

2.5.3-GTNH

2.5.4-GTNH

2.5.5-GTNH

2.5.6-GTNH

2.5.7-GTNH

2.5.8-GTNH

2.5.9-GTNH

2.6.0-GTNH

2.6.1-GTNH

2.6.2-GTNH

2.6.3-GTNH

2.6.4-GTNH

2.6.5-GTNH-pre

2.6.6-GTNH

2.7.0-GTNH

2.7.1-GTNH

2.7.10-GTNH-pre

2.7.11-GTNH

2.7.12-GTNH

2.7.13-GTNH

2.7.14-GTNH

2.7.15-GTNH

2.7.16-GTNH

2.7.2-GTNH-pre

2.7.3-GTNH-pre

2.7.4-GTNH

2.7.5-GTNH-pre

2.7.6-GTNH-pre

2.7.7-GTNH-pre

2.7.8-GTNH-pre

2.7.9-GTNH

2.8.0-GTNH

2.8.1-GTNH

2.8.2-GTNH

2.8.3-GTNH

2.8.4-GTNH

2.8.5-GTNH

2.9.0-GTNH

2.9.1-GTNH

2.9.2-GTNH

2.9.3-GTNH

2.9.4-GTNH

Mono Color

• ad9135590d Starting to flesh out Thaumic Apiary. MysteriousAges 2015-03-15 01:06:14 -07:00
• 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 MysteriousAges 2015-03-15 00:45:43 -07:00
• 7bd5e7ac54 Refactoring Effect Jar code a bit. MysteriousAges 2015-03-14 15:39:05 -07:00
• 8cda9b9f43 Hazardifying Thaumic Apiary GUI. MysteriousAges 2015-03-14 15:38:37 -07:00
• 444303d06d Hazardifying apiary textures. Deleting unused greatwood & silverwood plank textures. MysteriousAges 2015-03-14 15:22:07 -07:00
• b3ca22fd1f Administrative cleanup stuff. Whee. MysteriousAges 2015-03-14 15:11:35 -07:00
• 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. MysteriousAges 2015-03-14 15:06:01 -07:00
• 3d1cdfa9af Adding BS files to gitignore. MysteriousAges 2015-03-14 14:00:07 -07:00
• 1275abc1c4 Cleaning up Config.java some. MysteriousAges 2015-03-14 13:59:24 -07:00
• 3347afb0c3 Update imports to unstable forestry Arkandos 2015-01-16 22:59:06 +01:00
• 016049ef67 Merge my branch into the main one, initial work on the thaumic apiary Arkandos 2015-01-16 22:06:02 +01:00
• 33b0af6682 Close #27 Use Forestry API for hive generation mezz 2015-01-13 23:54:32 -08:00
• 8bf47d8f5f Update to latest unstable forestry mezz 2015-01-11 01:51:48 -08:00
• e9c91cda37 Make config fields start lowercase mezz 2015-01-10 14:02:45 -08:00
• f645076eeb Make config options consistently static mezz 2015-01-10 14:01:51 -08:00
• 8ccb8f4d75 Merge pull request #28 from Adaptivity/UpdateruRUlang mezz 2015-01-10 10:27:27 -08:00
• 142637151a Update ru_RU.lang Adaptivity 2015-01-10 17:56:46 +03:00
• 469867bc1f Close #22 have Apatite bees require block of Apatite instead of the ore mezz 2015-01-10 00:55:52 -08:00
• 712679d8ac Fix #25 Broken Thaumcraft research mezz 2015-01-10 00:49:05 -08:00
• 8eb8363b31 missed one mezz 2015-01-10 00:16:21 -08:00
• cd758dfec2 Fix #18 Bees not delivering notes in Escritoire mezz 2015-01-10 00:05:04 -08:00
• 629cd06ef6 Fix #24 Game does not load if Thaumcraft not installed mezz 2015-01-09 23:13:32 -08:00
• 8e11456ea3 Fix #19 Transmuting Effect Causes Server Crash mezz 2015-01-09 22:45:03 -08:00
• 2c5e6ca041 Fix #4 Placing a bee into the jar gui causes a crash mezz 2015-01-09 00:21:55 -08:00
• a739206e01 Fix typo in Mysterious magnet mezz 2015-01-08 23:46:54 -08:00
• 9b9926b340 Update dependencies (Forge, Forestry, Thaumcraft, BloodMagic) mezz 2015-01-08 23:42:46 -08:00
• dac7c0ddef Autoformat: spaces to tabs, remove unused imports mezz 2015-01-08 21:48:13 -08:00
• a6d1a9f1a4 Create Readme mezz 2015-01-08 18:57:26 -08:00
• 98a5e73ddf Update the changelog Arkandos 2014-10-24 19:30:01 +02:00
• f68b47473f Merged in Astrologers/magic-bees (pull request #4) Arkandos 2014-10-24 12:54:47 +02:00
• a0df95b36c new zh_CN.lang Astrologers 2014-10-24 18:28:50 +09:00
• 6ff6b72580 Merged in marcin212/magic-bees (pull request #3) Arkandos 2014-10-18 17:03:37 +02:00
• 2f5cbb7d3c Fixed issue #23 Infernal Hive not spawning (+1 squashed commits) marcin212 2014-09-30 17:15:19 +02:00
• 250e5c159f More bugfixes Arkandos 2014-10-09 12:00:15 +02:00
• 0c5f27e192 Bugfixes Arkandos 2014-09-23 00:30:12 +02:00
• a6c439c078 Started work on Thaumic Apiary Arkandos 2014-09-16 20:30:20 +02:00
• 300a22efab Merged in Vexatos/magic-bees-1/Vexatos/updated-de_delang-1408802455071 (pull request #2) Arkandos 2014-08-23 16:25:28 +02:00
• fdf89303e4 Updated de_DE.lang Vexatos 2014-08-23 14:01:07 +00:00
• ffe3f9d33e Updated to Tarig0s Language files Arkandos 2014-08-23 01:34:02 +02:00
• 0e0eaac495 Fixes. Arkandos 2014-08-23 00:33:46 +02:00
• e9c423579b Seems good. Merging Arkandos 2014-08-17 23:15:49 +02:00
• 1be990eb0e Add forestry maven repo Tarig0 2014-08-17 21:07:42 +00:00
• 87a918b7c6 Centrifuge fixes Arkandos 2014-08-17 19:51:35 +02:00
• 580f1f4e12 Bugfixes and Modularization Arkandos 2014-08-11 14:09:15 +02:00
• 2b0b729ad0 Started work on BloodMagic bees Arkandos 2014-08-04 01:28:57 +02:00
• f5a6ca61ba Started work on Bloodmagic Bees Arkandos 2014-08-02 18:55:38 +02:00
• 44ecbbdc45 Implemented config gui Arkandos 2014-08-01 19:28:34 +02:00
• d3c6ad5433 1.7.10 Port Arkandos 2014-08-01 04:05:49 +02:00
• 5b053dd990 Merged in Vexatos/magic-bees-1/Vexatos/en_usxml-edited-removed-german-species-n-1398711730720 (pull request #6) MysteriousAges 2014-04-28 12:11:40 -07:00
• e416d09dde en_US.xml edited, removed German species names Vexatos 2014-04-28 19:03:16 +00:00
• 723506d04f Merged in Vexatos/magic-bees (pull request #5) MysteriousAges 2014-04-28 11:55:37 -07:00
• c352b42fc1 Update de_DE.xml, removed duped entry from en_US Vexatos 2014-04-22 10:18:50 +02:00
• 95275e57d6 Merged in Minalien/magic-bees (pull request #4) MysteriousAges 2014-04-08 16:48:24 -07:00
• 02659b2816 Upgraded to 1.7.2. List of currently-known issues are in CURRENT_ISSUES.txt file. Ken 'Minalien' Murray 2014-04-08 12:39:01 -07:00
• 02655f092e Tagging MB with license info MysteriousAges 2014-01-24 03:00:08 +00:00
• 03bc6c0d83 Fixing WorldGeneratorHandler.java 'cause oops. MysteriousAges 2014-01-21 14:00:32 -08:00
• 85f8ab960d Tidying up from merge some Switching hivegen to respect isGenMineableReplaceable for crazy mods like underground biomes. MysteriousAges 2014-01-18 12:44:14 -08:00
• 2146249b9c Cleaning up code from TE merge MysteriousAges 2014-01-16 13:51:51 -08:00
• a4ebd6d859 Merged in jadedcat/magic-bees-jc (pull request #3) MysteriousAges 2014-01-16 12:35:07 -08:00
• 6c79dfb104 Thermal Expansion and Redstone Arsenal Bees jadedcat 2014-01-16 14:31:09 -06:00
• 9233d45b33 Revert "Merged in kieranmenor/magic-bees (pull request #1)" MysteriousAges 2014-01-16 12:13:00 -08:00
• 7082436190 Merged in kieranmenor/magic-bees (pull request #1) MysteriousAges 2014-01-15 18:45:50 -08:00
• fb8873b781 Build. MysteriousAges 2014-01-12 17:11:25 -08:00
• 12c1b3b5c3 (Possibly) fixing busted AM2 mob spawns. MysteriousAges 2013-12-27 13:35:59 -08:00
• ecaa9babf7 TCons renamed their aluminum ore. -_- MysteriousAges 2013-12-27 13:35:40 -08:00
• 16086558e4 Fixes to fluids. MysteriousAges 2013-12-18 15:34:35 -08:00
• cc4390ec21 Fluid name updates MysteriousAges 2013-12-18 13:44:42 -08:00
• 0cb6505fd4 build nonsense MysteriousAges 2013-12-18 12:53:07 -08:00
• 52128123ef Shadow on tempus aspect Config option to switch off otherworld hives spawning in magic biomes. MysteriousAges 2013-12-17 11:41:23 -08:00
• 6136a59a15 Tweaks and things. MysteriousAges 2013-11-02 13:24:45 -07:00
• 0886fd1389 Build script updates Changing recipe of Dimensional Singularity to make it less painful. MysteriousAges 2013-10-20 23:15:49 -07:00
• ea409d34de Hive frames are not enchantable. (Enchants never did anything anyway.) Adjusting hive spawn code. MysteriousAges 2013-10-10 23:39:04 -07:00
• 1f7fe61afe Rewrote most of the hive spawn logic. Spawn chances for each hive are defined in HiveType.initHiveData() for each biome type. Kieran Menor 2013-10-08 02:17:54 +02:00
• 1cb45e24c5 Build script changes for jenkins. MysteriousAges 2013-10-06 22:28:56 -07:00
• 7ab175d8b6 Block update message. Guessing 0 people are going to see this, but whatever. MysteriousAges 2013-10-06 21:18:50 -07:00
• 31ff948c6d Cleaning up some old commented crap. MysteriousAges 2013-10-06 12:26:24 -07:00
• fa2590d41e Fixes. MysteriousAges 2013-09-29 19:41:16 -07:00
• 0e77348285 Shit. It's going into the repo. MysteriousAges 2013-09-25 21:21:03 -07:00
• 608656be73 Refactoring resource locations to reference CommonProxy.DOMAIN. Adding the Mysterious Magnet. MysteriousAges 2013-09-17 19:40:26 -07:00
• 58c56623af Fixing indentation. (Remind me to not use Eclipse to edit these.) MysteriousAges 2013-09-16 10:05:40 -07:00
• f05c12b2ee Holy shit, all the research! Also, some new stuff. @_@ MysteriousAges 2013-09-16 00:30:40 -07:00
• 4b802d4727 + Mutating essence Renaming other essences to shorter forms MysteriousAges 2013-09-15 20:47:56 -07:00
• ffd6f2ca94 TC4 & AM2 integration progress! <3 MysteriousAges 2013-09-12 19:33:08 -07:00
• c309c20268 Seriously Thaumcraft? WTF. Fixing logic error in Railcraft transmutation effect logic. MysteriousAges 2013-09-10 15:24:52 -07:00
• 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. MysteriousAges 2013-09-09 23:23:00 -07:00
• e23ebd1011 Pulling forward some changes to 1.5 MysteriousAges 2013-09-04 21:07:04 -07:00
• 707a9bd64e Fixing disable check. MysteriousAges 2013-09-04 21:02:36 -07:00
• 6c567e247a Deactivating TC3 integration. Fixing bad animated textures. MysteriousAges 2013-09-04 20:44:03 -07:00
• 132d9b47f0 Merge branch '1.5' of bitbucket.org:MysteriousAges/magic-bees into 1.5 MysteriousAges 2013-09-04 16:23:20 -07:00
• 5090aa76ea Stuff! (It's in the changelogs.) MysteriousAges 2013-09-02 17:32:59 -07:00
• 61e6b82bc3 Mutations for Crumbling & Mutable. MysteriousAges 2013-08-28 23:44:38 -07:00
• 533d7d55a8 Crumbling, Transmuting bees & their (crappy) effects. MysteriousAges 2013-08-28 17:46:38 -07:00
• 7513ba1255 Fixing mutation rate on Iron bees. MysteriousAges 2013-08-26 11:35:53 -07:00
• a560085ac9 Liquid references renaming to Fluid. Should wrap up 1.6 port. MysteriousAges 2013-08-25 20:43:00 -07:00
• f9ceeba358 Porting to 1.6. MysteriousAges 2013-08-25 19:56:55 -07:00
• c5d59a4505 Moving model texture dir MysteriousAges 2013-08-25 18:50:01 -07:00
• 0a6f6eda09 Begin port to 1.6 MysteriousAges 2013-08-25 18:48:41 -07:00
• ca8b206912 Lang changes. Effect data fix. MysteriousAges 2013-08-18 23:25:33 -07:00
• 3aea0376bc Changelog. MysteriousAges 2013-08-02 23:01:22 -07:00
• 7751c01463 Bugs. MysteriousAges 2013-08-02 22:58:06 -07:00