upstream/ThaumicEnergistics
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/ThaumicEnergistics.git synced 2026-10-26 14:33:46 +00:00
Code Issues Packages Projects Releases Wiki Activity
397 Commits 2 Branches 153 Tags
1.3.19-GTNH
Commit Graph
397 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Martin Robertz f42a385223 Merge pull request #24 from GTNewHorizons/feature/condenser 
Fix Essentia Condenser interaction
1.3.19-GTNH 		2022-06-26 10:21:12 +02:00
repo_alt b1dd55e80c Fix Essentia Condenser interaction 2022-06-26 10:57:32 +04:00
Martin Robertz a968a90f78 Merge pull request #23 from GTNewHorizons/amountToCraft 
Adapt to AE2 change
1.3.18-GTNH 		2022-06-21 15:09:17 +02:00
miozune 81ddcc6f65 Adapt to AE2 change 2022-06-19 16:10:51 +09:00
Martin Robertz eab50c0e52 Merge pull request #22 from DianeXD/master 
Allow NEI to mark Aspect
1.3.17-GTNH 		2022-06-09 21:01:34 +02:00
DianeXD 261ebc4125 Bug fix 2022-06-10 00:48:19 +08:00
DianeXD 057e3e7a34 Bug fix 2022-06-09 21:06:36 +08:00
DianeXD fa030a2def Allow NEI to mark Aspect 2022-05-23 17:34:17 +08:00
DianeXD 776fa14756 Update buildscript 2022-05-23 17:24:56 +08:00
Jason Mitchell 880a9db744 add CCC/CCL 1.3.16-GTNH 2022-01-18 11:43:18 -08:00
Jason Mitchell ead7efd596 update to explicit dependencies 2022-01-18 11:40:24 -08:00
Jason Mitchell 73744d18bd maven publish buildscript update 2022-01-18 11:20:17 -08:00
repo-alt 00e42a4f0d Merge pull request #21 from GTNewHorizons/feature/NPEfix 
fix NPE at PartEssentiaStorageMonitor.TrackingInformation
 2022-01-18 08:37:58 +03:00
repo_alt 157321b700 fix NPE at PartEssentiaStorageMonitor.TrackingInformation 2022-01-18 08:01:00 +03:00
Martin Robertz a8da7b9556 Merge pull request #20 from repo-alt/master 
fix essentia cache monitoring void jars
 2021-12-30 16:17:35 +01:00
repo_alt b462f5b755 fix essentia cache monitoring void jars 
(also some warnings cleanup)
 2021-12-30 14:05:01 +03:00
Martin Robertz 3845848da8 Merge pull request #19 from GTNewHorizons/unified-build-script 
Migrated to unified build script
1.3.15-GTNH 		2021-12-19 14:58:38 +01:00
Johann Bernhardt 4f3b4f55e0 Migrated to unified build script 2021-12-19 11:56:47 +01:00
Martin Robertz 12eeb99dd1 Merge pull request #18 from GTNewHorizons/update_license 
Update License
 2021-12-05 20:49:38 +01:00
Jason Mitchell cbe08d23b1 Update License 2021-12-05 11:43:16 -08:00
Martin Robertz 434c711aa1 Merge pull request #17 from GTNewHorizons/update-build 
update build
 2021-12-03 17:02:42 +01:00
bombcar 91dafca6cc update https 2021-12-03 09:59:18 -06:00
bombcar 54ecd1dc9c update build 2021-12-03 09:54:44 -06:00
Martin Robertz 0f3bf8451e bump version 
(cherry picked from commit 726773cabe8b8a90699b436a4262ec94540993f6)
1.3.14-GTNH 		2021-12-02 23:21:42 +01:00
Martin Robertz 7e10f9835b Merge pull request #16 from GTNewHorizons/update-build 
update build
 2021-12-02 23:12:07 +01:00
bombcar 874a99e8c5 update build 2021-12-02 16:07:30 -06:00
DreamMasterXXL 36d031e756 bump version 1.1.3.13-GTNH 2021-09-18 13:06:11 +02:00
Martin Robertz b2a72e7457 Merge pull request #15 from repo-alt/AE2-RV3 
Allow shapeless recipes with duplicate ingredients
 2021-09-10 07:58:37 +02:00
repo_alt e18e26d57d Allow shapeless recipes with duplicate ingredients 2021-09-07 21:43:48 +03:00
Martin Robertz 01e5362238 Merge pull request #14 from Usernm0/knowledge-inscriber-fix 
Fix knowledge inscriber crash
 2021-09-07 18:59:05 +02:00
Usernm 5b41d3f669 Proper fix null checks 
Proper fix null checks
 2021-09-07 03:17:27 +03:00
Usernm a3cc0fd527 Fix knowledge inscriber crash 
Add null checks to prevent crash
 2021-09-07 00:06:08 +03:00
Martin Robertz bfdb5bea09 Merge pull request #13 from repo-alt/AE2-RV3 
Allow updating obsolete patterns
1.1.3.12-GTNH 		2021-07-23 23:48:44 +02:00
repo_alt 251c35d5cb Allow updating obsolete patterns 
https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/8208
 2021-07-15 18:47:50 +03:00
repo-alt 4cc676a803 Merge pull request #12 from repo-alt/AE2-RV3 
Add alternative recipe aspect cost check
1.1.3.11-GTNH 		2021-02-17 18:54:39 +03:00
repo_alt 2ebece716d Add alternative recipe aspect cost check 
(https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/7492)
 2021-02-17 18:53:54 +03:00
repo-alt 05b181d662 Merge pull request #11 from repo-alt/AE2-RV3 
some more containers
 2021-01-11 12:13:09 +03:00
repo_alt 24c34dc197 some more containers 2021-01-11 12:12:12 +03:00
repo-alt f74f99b7e8 Merge pull request #10 from repo-alt/AE2-RV3 
Support for various essentia containers
1.1.3.10-GTNH 		2021-01-11 11:31:43 +03:00
repo_alt 33a2384b04 Support for various essentia containers 
https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/7290
 2021-01-11 11:30:12 +03:00
repo-alt a23cebb2e9 Merge pull request #9 from repo-alt/AE2-RV3 
fixed damageable ingredients usage and a bit cleanup
1.1.3.9-GTNH 		2020-12-29 03:05:31 +03:00
repo_alt 14f7282c92 fixed damageable ingredients usage and a bit cleanup 
https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/7178
 2020-12-29 03:04:31 +03:00
repo-alt 3ff6a54e48 Merge pull request #8 from repo-alt/AE2-RV3 
Null check against world access while unloading
1.1.3.8-GTNH 		2020-12-22 20:02:01 +03:00
repo_alt d732527fe3 Null check against world access while unloading 
https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/7146
 2020-12-22 19:59:43 +03:00
repo-alt c2cf084a8f Merge pull request #7 from repo-alt/AE2-RV3 
NEI overlay crash with arcane recipes
1.1.3.7 		2020-12-03 23:42:36 +03:00
repo_alt 889f693e1b NEI overlay crash with arcane recipes 2020-12-03 23:41:19 +03:00
repo-alt 47cb0f4d57 Merge pull request #6 from repo-alt/AE2-RV3 
Added proper NEI overlay
1.1.3.6 		2020-10-08 21:02:10 +03:00
repo_alt 978d9e792d Added proper NEI overlay 
https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/6479
 2020-10-08 21:01:14 +03:00
repo-alt 3223572b4c Merge pull request #5 from repo-alt/AE2-RV3 
Wireless terminal fix
1.1.3.5 		2020-09-15 20:50:34 +03:00
repo_alt a5114ecd49 version bumped 2020-09-15 20:48:55 +03:00