upstream/MagicBees
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/MagicBees.git synced 2026-11-12 16:27:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
693 Commits 3 Branches 94 Tags
dcfa448af33db49285c72d45d9bbf20671af4a86
Commit Graph
693 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Martin Robertz dcfa448af3 Merge pull request #37 from Quantumlyy/drainer-energistics 
Add Thaumic Energistics support to the Apimancers drainer
2.7.11-GTNH 		2024-01-28 19:55:12 +01:00
Martin Robertz 786cb01b94 Merge pull request #35 from kamenskyi/add_ru_lang_file 
Update ru_RU.lang
 2024-01-28 18:38:11 +01:00
Quantumlyy f6f4a988af move theapi init to postinit 2024-01-28 18:13:39 +01:00
kamenskyi 5a823658ea Update ru_RU.lang 
fix ru mistakes
 2024-01-28 20:04:58 +03:00
Quantumlyy 8770492524 register drainer with ThEApi 2024-01-28 18:00:38 +01:00
Martin Robertz 322203ac6a Merge branch 'master' into drainer-energistics 2024-01-28 11:34:14 +01:00
Quantumlyy 1e5c8db826 sa 2024-01-28 11:30:17 +01:00
Quantumlyy ef47b1863a call normal updateentity 2024-01-28 11:18:16 +01:00
Martin Robertz c3dac80d44 update deps 2.7.9-GTNH 2024-01-28 11:12:31 +01:00
Quantumlyy f2beaae45c this should make it work with TE now 2024-01-28 11:03:49 +01:00
Martin Robertz 3a4e4dce04 Merge pull request #34 from Quantumlyy/bring-closer-to-forestry 
Add Apimancers Drainer
 2024-01-28 09:39:48 +01:00
Alastors 99c3cb68eb minor cleanup 2024-01-28 02:49:57 -05:00
Alastors 38bc8a151c fixing the block side 2024-01-28 02:38:26 -05:00
Quantumlyy a64bd5f437 check that block side is not top 2024-01-27 11:36:09 +01:00
Quantumlyy fb43f46bb8 fix: check for gtnh coremod to determine drainer functionality 2024-01-27 11:22:20 +01:00
Quantumlyy 9d2c667c35 the grand rename 2024-01-21 21:01:57 +01:00
Quantumlyy 67dfeb7daa requested changes 2024-01-21 20:55:21 +01:00
Quantumlyy e2080bc542 sa 2024-01-21 20:55:01 +01:00
Quantumlyy b0116884f1 GTu no transitive 2024-01-21 20:47:26 +01:00
Quantumlyy a9948fcf26 sa 2024-01-21 20:37:50 +01:00
Quantumlyy 828231c3c4 Merge branch 'bring-closer-to-forestry' of https://github.com/Quantumlyy/MagicBees into bring-closer-to-forestry 2024-01-21 20:35:45 +01:00
Quantumlyy aed51fbd9a add infusion recipe 2024-01-21 20:35:40 +01:00
Alastors 9bae32761c Update build.gradle 2024-01-21 14:33:30 -05:00
Alastors 25c04cedcb Update dependencies.gradle 2024-01-21 14:32:54 -05:00
Martin Robertz cfe1cad9e8 Merge branch 'master' into bring-closer-to-forestry 2024-01-12 19:01:54 +01:00
Martin Robertz 766a440429 update bs+deps 2.7.4-GTNH 2024-01-12 18:58:10 +01:00
Raven Szewczyk 428bfb04f8 [ci skip] upgraded build system 2024-01-08 21:27:14 +00:00
Quantumlyy 9fb5e3d8fb reword 2.7.3-GTNH-pre 2023-12-31 15:08:34 +01:00
Quantumlyy 3da4083bba localize 2023-12-31 15:04:53 +01:00
Quantumlyy 9d36165259 cursed shit 2023-12-31 15:03:38 +01:00
Nejc Drobnič 573c089b96 Merge pull request #1 from GTNewHorizons/dev 
update
 2023-12-31 14:46:55 +01:00
Martin Robertz b82ce5e15f update 2023-12-31 14:44:27 +01:00
Martin Robertz 4f5358bea6 Update Config.java 2.7.2-GTNH-pre 2023-12-24 21:15:17 +01:00
Martin Robertz df0761c9af Update dependencies.gradle 2023-12-24 21:02:53 +01:00
Martin Robertz b5165b3e58 Update Config.java 2023-12-24 21:00:38 +01:00
kamenskyi 12f8ed9435 Update ru_RU.lang 
add ru lang file
 2023-12-24 21:06:26 +03:00
Quantumlyy edf3ff7423 add prod multiplier based on industrial apiary speed 2023-12-14 07:39:02 +01:00
Quantumlyy 06571c1eb4 check for queen in industrial apiary 2023-12-13 22:41:09 +01:00
Quantumlyy 4823e44793 add some scanner data 2023-12-13 12:04:15 +01:00
Quantumlyy f55a9f7643 address review 2023-12-13 09:58:59 +01:00
Quantumlyy 65b698face perform standard check alongside gt check 2023-12-13 09:43:43 +01:00
Quantumlyy 123ff12302 implement alternative housing checker for industrial apiary 2023-12-13 09:19:05 +01:00
Quantumlyy 6e6cbbab48 rename phialing cabinet to apiamancers drainer 2023-12-13 08:56:47 +01:00
Quantumlyy b965d50bbc oops 2023-12-13 08:32:34 +01:00
Quantumlyy fb98d686fb create method for detecting if housing is present 2023-12-13 08:32:13 +01:00
Quantumlyy ff20b5f600 change housing detection 2023-12-13 07:31:10 +01:00
Quantumlyy 2ade3e5705 use instanceof 2023-12-13 07:09:14 +01:00
Quantumlyy b7a928bb06 debug 2023-12-13 06:59:25 +01:00
Quantumlyy ec4491994c add bee ageing 2023-12-12 21:30:11 +01:00
Quantumlyy 89acb72f0b add textures 2023-12-12 19:29:38 +01:00