Joshua Gwinn
c3f48c333f
Optimization to Digital Miner search thread
...
This is a slight change to the digital miner search thread to remove the
object creation that occurs for each block checked. It is a sort of
minor thing, but it will help to keep the memory requirements for the
thread down and execution maybe slightly faster.
2014-02-19 22:12:57 -07:00
Aidan C. Brady
7c9d267499
Fix factories resetting progress
2014-02-19 23:36:01 -05:00
Aidan C. Brady
656a1a8baa
Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
2014-02-19 23:21:58 -05:00
Aidan C. Brady
2ec88debdf
Donator data is now pulled remotely, digital miner shouldn't halt the game anymore, fixed Electrolytic Separator issue. @pgatt, please test.
2014-02-19 23:21:52 -05:00
Aidan Brady
3d4e01400f
Even more Digital Miner optimization
2014-02-17 23:46:31 -05:00
Aidan C. Brady
74e14284c7
Re-add chunk checks...whoops!
2014-02-17 21:12:33 -05:00
Aidan C. Brady
b3f9c48afe
Attempt some memoization, please test and report pgatt, judge
2014-02-17 18:48:31 -05:00
Aidan C. Brady
2e8780e597
Update donator list
2014-02-17 12:03:42 -05:00
Aidan C. Brady
9915d18baa
Add visible configuration to Metallurgic Infuser, made Chemical Crystalizer auto-eject and gave it inventory configuration
2014-02-17 00:14:02 -05:00
Aidan C. Brady
95698e45ea
Kill off old induction stuff, bump version to 6.0.1
2014-02-16 23:50:56 -05:00
Aidan C. Brady
819e82e0f0
Fix Digital Miner issues (hopefully)
2014-02-16 23:48:06 -05:00
Aidan C. Brady
7b53164be6
Finalize release. v6 is now public.
2014-02-16 20:12:43 -05:00
Aidan C. Brady
cea0312f17
Mekanism v6 official release
2014-02-16 20:01:53 -05:00
Aidan C. Brady
40edc8d82f
Digital Miner re-overhaul. Now using BitSets to reduce worst-case-scenario calculations to use less than 0.8% of the memory they did previously. CPU performance also boosted.
2014-02-16 19:47:51 -05:00
Aidan C. Brady
458276e0a1
Add a few additional recipes
2014-02-16 13:13:35 -05:00
Aidan Brady
8c8f6c32aa
Fix a few issues
2014-02-15 17:10:13 -05:00
Aidan Brady
527ec1b171
Fix tesseract compatibility
2014-02-15 16:44:29 -05:00
Aidan Brady
73be8c65d7
Step 1 of another Digital Miner refactor
2014-02-15 15:00:42 -05:00
Aidan Brady
1a179b914c
Fix Digital Miner text
2014-02-15 14:50:40 -05:00
Aidan Brady
1bf35e9314
Fix machine type bug
2014-02-15 13:24:34 -05:00
Aidan Brady
9ac1325b35
Revert "TEMP FIX for Wylker, will be rolled back for matured changes in v6"
...
This reverts commit 0b861f71af
.
2014-02-14 19:04:06 -05:00
Aidan Brady
996b5fcf56
Final change for v6 release :)
2014-02-14 18:45:42 -05:00
Aidan C. Brady
b593c7c202
Updated IC2 API, added in option to disable particles/lighting updates on machines
2014-02-14 17:55:34 -05:00
Aidan C. Brady
27199c9721
Fix negative energy buffer issue
2014-02-14 17:45:51 -05:00
Aidan C. Brady
b2e9e03584
Redstone Block is now an infuse object
2014-02-14 17:41:34 -05:00
Aidan C. Brady
5b553c5fbc
Hopefully fixed CME
2014-02-12 19:13:51 -05:00
Aidan C. Brady
e9e4d381f2
Fixed teleported crash
2014-02-12 19:08:53 -05:00
Aidan C. Brady
cf73d1f2c0
A few tiny fixes
2014-02-12 19:05:43 -05:00
Aidan C. Brady
4c4f534e5b
Digital Miner overhaul - easier than I thought. Also cleanup.
2014-02-11 21:12:54 -05:00
tterrag1098
60664ef71b
Formatting derps
2014-02-10 22:49:40 -05:00
tterrag1098
3a8847bdc8
Add minor safeguard for ItemProxy's in player invs
2014-02-10 22:48:52 -05:00
Aidan Brady
c05a2516b9
Preparing for DM overhaul
2014-02-10 21:59:18 -05:00
Aidan Brady
0904b4d7f6
Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
2014-02-10 21:12:31 -05:00
Aidan Brady
28459b134e
Armored Jetpack…done. Also made Charcoal Blocks fuel sources
2014-02-10 21:10:30 -05:00
Aidan C. Brady
661d421ffe
Should be fixed
2014-02-09 12:52:18 -05:00
Aidan C. Brady
4d1b3d0721
Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
2014-02-08 19:45:53 -05:00
Aidan C. Brady
24e7b0c450
Fix a few bugs
2014-02-08 19:41:52 -05:00
Aidan Brady
03ab491ce2
Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
2014-02-07 20:50:24 -05:00
Aidan Brady
d32a7f1e06
no message
2014-02-07 20:50:10 -05:00
Aidan C. Brady
b43044cc07
Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
...
Conflicts:
common/mekanism/client/render/ModelCustomArmor.java
2014-02-06 22:50:34 -05:00
Aidan C. Brady
c5634479cb
Touch up on Free Runners positioning
2014-02-06 22:46:31 -05:00
Aidan Brady
f617e188f4
Quick fixes
2014-02-05 21:37:17 -05:00
Aidan Brady
81fed07f96
Start on Armored Jetpack
2014-02-05 21:25:05 -05:00
Aidan Brady
b821be5417
General enhancements
2014-02-05 20:22:43 -05:00
Aidan Brady
6e210f0730
Model positioning
2014-02-05 19:26:57 -05:00
Aidan C. Brady
879bc0e93d
Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
2014-02-05 13:39:29 -05:00
Aidan C. Brady
2e325a0d31
Start on new Advanced Solar Generator model
2014-02-05 13:39:24 -05:00
Aidan Brady
6e1c428d32
Work on Atomic Disassembler positioning
2014-02-04 23:48:37 -05:00
Aidan Brady
afd954b510
Begin implementation of new AD model
2014-02-04 23:06:33 -05:00
Aidan Brady
316468e4ca
Fix a compile error
2014-02-04 21:20:13 -05:00
Aidan
5d494a8d8d
Merge pull request #963 from spookydonut/development
...
Made Electrolytic Separators vent excess gas by default
2014-02-04 14:48:53 -08:00
Aidan C. Brady
1a20773392
Added fancy Nether Steel Ore recipe
2014-02-04 12:24:39 -05:00
Aidan C. Brady
305f23d54d
Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
2014-02-04 08:15:26 -05:00
Aidan C. Brady
89e2279cb9
Fix a few bugs
2014-02-04 08:15:20 -05:00
spookydonut (Ash Wiren)
a15d964a8a
Added UI elements for #962 , making electrolytic separators dump excess gas
2014-02-04 17:07:37 +08:00
spookydonut (Ash Wiren)
6400dfe3bb
Made Electrolytic Separators vent excess gas by default
2014-02-04 13:29:27 +08:00
Aidan Brady
c8002dda5f
Fixed Adv. Electric Machine issue, fixed crash, Robits now display moving treads
2014-02-03 21:28:48 -05:00
Aidan Brady
8145b31997
Chemical Crystalizer can now output on right side. Note that it will not auto-eject.
2014-02-02 22:07:40 -05:00
Aidan C. Brady
6eb461f569
Added missing recipes
2014-02-02 11:05:09 -05:00
Aidan C. Brady
69a05815d7
Wow. Fixed a ridiculously dumb CME.
2014-02-01 22:37:22 -05:00
Aidan C. Brady
99b7172789
Updated donators list
2014-02-01 22:32:19 -05:00
Aidan C. Brady
efe03f6954
Friction Boots now have step assist
2014-02-01 22:02:50 -05:00
Aidan C. Brady
10844201d2
Touch up on Chemical Dissolution Chamber GUI title
2014-02-01 21:27:10 -05:00
Aidan C. Brady
c6cb70c9da
Gas tanks can now dump gasses
2014-02-01 20:32:26 -05:00
Aidan C. Brady
9b1c605131
Fix a few Cardboard Box bugs
2014-02-01 19:20:10 -05:00
Aidan C. Brady
30782caa8b
Cardboard Box blacklist
2014-02-01 19:02:51 -05:00
Aidan C. Brady
733bdd5691
Friction Boots? Done.
2014-02-01 16:38:09 -05:00
Aidan C. Brady
efe2502be1
Friction Boots - semi-working
2014-02-01 16:33:27 -05:00
Aidan C. Brady
c3a1b6b3c5
Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
2014-02-01 15:15:37 -05:00
Aidan C. Brady
fa55b3a8ce
Chemical Crystalizer NEI module
2014-02-01 15:15:30 -05:00
Aidan Brady
3803bfde24
Add resources for Friction Boots
2014-02-01 15:04:37 -05:00
Aidan C. Brady
2085220637
Chemical Dissolution Chamber NEI module
2014-02-01 14:59:31 -05:00
Aidan C. Brady
04441968be
Chemical Washer NEI module
2014-02-01 14:36:55 -05:00
Aidan C. Brady
228e550baa
Spinning stuff!
2014-02-01 14:19:47 -05:00
Aidan C. Brady
214be2bbba
Fix Electric Pump model, fix Chemical Crystalizer operation
2014-02-01 14:00:34 -05:00
Aidan C. Brady
eae1364b7e
Polishing GUIs
2014-02-01 13:48:37 -05:00
Aidan C. Brady
4eeea3b0f3
More work
2014-02-01 12:58:22 -05:00
Aidan C. Brady
c0b470bf71
GUI work
2014-02-01 12:28:04 -05:00
Aidan C. Brady
9df7d50159
Added sounds, GUIs now display on machines
...
Need to fix up text, add detail, and start work on NEI tomorrow
2014-02-01 00:48:01 -05:00
Aidan Brady
ead65e037d
Finished CLR implementation of GUIs
2014-01-31 22:28:58 -05:00
Aidan Brady
e84afbda9e
Updated donators list
2014-01-31 17:21:50 -05:00
Aidan Brady
0f841bad93
Fixed Weylyn’s crash
2014-01-31 16:42:35 -05:00
Aidan C. Brady
5c976f1b3c
Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
2014-01-31 16:32:25 -05:00
Aidan C. Brady
32b0e7f1cc
Work on new GUIs
2014-01-31 16:32:13 -05:00
Aidan C. Brady
b079bed810
Finished container code for new machinery
2014-01-31 14:59:12 -05:00
Aidan Brady
3e6e31ad3a
Added some recipes, fixed the Dictionary sync issue
2014-01-30 17:02:56 -05:00
Aidan Brady
d4e3b5f134
Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
2014-01-30 16:22:12 -05:00
Aidan Brady
7bf94fb4ef
Digital Miners now have much better redstone & ComputerCraft support that puts into account all bounding blocks
2014-01-30 16:22:01 -05:00
Aidan C. Brady
58f44cd3b3
Slightly cheaper unicable tiers
2014-01-28 20:15:01 -05:00
Aidan C. Brady
c4e679280b
Chemical Crystalizer base tile code
2014-01-28 19:29:29 -05:00
Aidan C. Brady
6a18c338cd
Finished Chemical Dissolution Chamber tile code
2014-01-28 18:47:06 -05:00
Aidan C. Brady
03fa654ddf
Start on Chemical Dissolution Chamber base code
2014-01-28 16:49:49 -05:00
Aidan C. Brady
72e10a8162
Just about finished base Chemical Washer code
2014-01-28 16:19:07 -05:00
Aidan C. Brady
90328958bb
Finished recipe system for new machines.
2014-01-28 15:51:30 -05:00
Aidan C. Brady
b0fbaba62b
Start work on recipe systems
2014-01-26 17:55:49 -05:00
Aidan C. Brady
b180f4e968
Started on new machines
2014-01-26 17:12:03 -05:00
Aidan Brady
b51e4dfd9f
Fix a small BC bug
2014-01-26 13:53:22 -05:00
Aidan C. Brady
ac008506e7
Balloons can be popped by arrows/etc, touched up Robit GUI bleeding text
2014-01-26 02:01:44 -05:00
Aidan Brady
c1aadd2bd0
NEI localization stuff
2014-01-25 16:29:36 -05:00
Mierzen
4ac0244b25
Fix typo
2014-01-25 18:35:30 +02:00
Aidan C. Brady
ba62cc5cb1
Fix that sound issue
2014-01-23 17:06:33 -05:00
Aidan C. Brady
7537d53027
Fix JABBA dupe bug
2014-01-23 16:58:52 -05:00
Aidan C. Brady
eca663a3a3
Added missing macerator recipes
2014-01-23 14:47:55 -05:00
Aidan C. Brady
a2c392f03d
Fixed dumb cardboard boxes
2014-01-22 14:37:25 -05:00
Aidan C. Brady
e11a79b3c3
Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
2014-01-22 07:43:34 -05:00
Aidan C. Brady
a001abda66
Fix Cardboard Box recipe
2014-01-22 07:43:28 -05:00
Aidan Brady
56943c8e2b
Fix transmitter issue
2014-01-21 21:05:27 -05:00
Aidan C. Brady
0a0e329223
Ore gasses! For use in T4 (5x) ore processing.
2014-01-21 17:58:00 -05:00
Aidan C. Brady
7c5fe23833
Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
2014-01-21 11:28:49 -05:00
Aidan C. Brady
6f723f64bd
Crystals! Currently useless.
2014-01-21 11:28:43 -05:00
Aidan Brady
1ca4aa6fcd
Factories now accept proper gasses
2014-01-20 16:35:42 -05:00
Aidan C. Brady
52aa704a74
Add in textures for some future stuff
2014-01-19 20:32:16 -05:00
Aidan C. Brady
ad38b6f52b
Minor fix
2014-01-18 15:31:00 -05:00
Aidan C. Brady
93b7321dea
T3 ore processing now uses Hydrogen Chloride
2014-01-18 15:10:17 -05:00
Aidan C. Brady
8c05c53b40
A few recipe enhancements
2014-01-18 14:04:51 -05:00
Aidan C. Brady
740f4581b0
Fix NEI support to dynamically accept different gas types
2014-01-18 12:16:14 -05:00
Aidan Brady
ee2b81c3fd
Fix up Clay Block recipe
2014-01-18 12:08:11 -05:00
Aidan C. Brady
31fbf5ee14
Added clay recipe, thanks @VapourDrive!
2014-01-18 11:41:41 -05:00
Aidan C. Brady
769a8a8e0c
Work on things!
2014-01-18 11:26:24 -05:00
Aidan Brady
a4017fcc0e
Work on things!
2014-01-18 02:31:36 -05:00
Aidan Brady
6eb72a7e44
Whoops! Fixed crash…
2014-01-18 00:50:56 -05:00
Aidan Brady
f5c607bef0
Fix up blacklist for cardboard boxes!
2014-01-18 00:45:27 -05:00
Aidan C. Brady
705352e7c4
Finish NEI support for Advanced Machines (I think)
2014-01-18 00:28:42 -05:00
Aidan C. Brady
7db4a114f6
Fixes
2014-01-17 21:29:39 -05:00
Aidan C. Brady
0314b11edb
Hopefully fix some things
2014-01-17 20:38:05 -05:00
Aidan C. Brady
74a64b3373
pulpWood for sawdust
2014-01-17 18:07:29 -05:00
Aidan C. Brady
9b7abb8d96
Added null check
2014-01-17 11:18:04 -05:00
Aidan C. Brady
61306fd664
More work on things
2014-01-17 09:17:38 -05:00
Aidan C. Brady
95a3084897
Work on basic block multi-id-meta stuff
2014-01-17 07:33:34 -05:00
Aidan C. Brady
af1ab186d9
Finish Salination Controller rendering, start work on a separate Salination Controller block.
...
..this means a lot of extra work to get multiple-id-meta-handling working with BasicBlocks.
2014-01-16 22:49:48 -05:00
Aidan C. Brady
0f06146292
You think sleep can stop me? HA!
...
...work on rendering.
2014-01-16 22:12:51 -05:00
Aidan Brady
41b2d1c2bb
Start on Salination Plant fancy render
2014-01-16 21:55:29 -05:00
Aidan Brady
44ae2e8606
Added null check for Vaygrim
2014-01-16 21:41:14 -05:00
Aidan Brady
fedb728709
Oops!
2014-01-16 21:36:32 -05:00
Aidan Brady
db029274f7
Fix up GUIs
2014-01-16 21:31:30 -05:00
Aidan Brady
175f3e8646
Got GUIs working with new fanciness
2014-01-16 21:26:40 -05:00
Aidan Brady
9acc264726
A few fixes
2014-01-16 20:50:59 -05:00
Aidan Brady
da6c0a2c90
Finish base code for gas-based advanced machinery
2014-01-16 20:35:05 -05:00
Aidan Brady
4fb335b7d3
Lay down framework for gas-based advanced machines
2014-01-16 19:00:53 -05:00
Aidan Brady
1de691be1d
Fix stacking of brine buckets
2014-01-16 16:49:19 -05:00
Aidan Brady
6d366c0475
Brine Buckets!
2014-01-16 16:47:35 -05:00
Aidan Brady
4d29a57a27
A few fixes, new textures
2014-01-16 16:31:05 -05:00
Aidan C. Brady
3e6a017979
Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
2014-01-16 16:04:18 -05:00
Aidan C. Brady
d3ae5be20b
Work on things!
2014-01-16 16:03:05 -05:00
ruifung
4e49ec6a76
Remove redundant energy unit in cable tooltip.
...
MekanismUtils.getEnergyDisplay() already returns a string with the energy unit chosen in config.
2014-01-17 00:04:50 +08:00
Aidan C. Brady
f6bca1d2c9
Added Salination Plant component recipes, removed a few printlns, more descriptive multiblock issue notifications
2014-01-15 23:52:10 -05:00
Aidan Brady
ee0193cb3d
Made that sawmill quieter
2014-01-15 23:12:48 -05:00
Aidan Brady
053b6f34f6
Salination Controller GUI handler because I’m nice
2014-01-15 23:03:40 -05:00
Aidan Brady
e83455ad2b
Fix cable tooltip
2014-01-15 18:02:19 -05:00
Aidan Brady
40663d6a6a
Fixed #838 , thanks @Not-steve
2014-01-15 18:01:12 -05:00