Ben Spiers
|
ab6da7571d
|
Improve the FluidNetwork's reporting of stored/flowing fluid a bit
|
2013-12-16 15:57:04 +00:00 |
|
Ben Spiers
|
79e8b36a4b
|
Fix a few crashes
|
2013-12-16 15:57:03 +00:00 |
|
Ben Spiers
|
c7a22b7cfd
|
Oops
|
2013-12-16 15:57:03 +00:00 |
|
Aidan C. Brady
|
646b22f5b5
|
Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
Conflicts:
common/mekanism/common/multipart/PartTransmitter.java
|
2013-12-16 09:56:01 -05:00 |
|
Aidan C. Brady
|
4ff79409f6
|
Work on saving and loading of transmitter caches
|
2013-12-16 09:51:07 -05:00 |
|
Ben Spiers
|
1534d1cb14
|
Make a start on Multipart Transporters.
|
2013-12-16 14:00:43 +00:00 |
|
Aidan C. Brady
|
4aa91b13ee
|
Killed off CalclaviaLib
|
2013-12-16 07:28:55 -05:00 |
|
Aidan C. Brady
|
c44b63fa3a
|
Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
|
2013-12-16 07:23:39 -05:00 |
|
Aidan C. Brady
|
3741488322
|
Hopefully fix CME
|
2013-12-16 07:23:33 -05:00 |
|
Aidan Brady
|
834abd46fe
|
Fix a few bugs
|
2013-12-16 07:03:47 -05:00 |
|
Aidan Brady
|
389f3cd988
|
Merge branch 'master' into development
Conflicts:
common/mekanism/common/tileentity/TileEntityChemicalFormulator.java
|
2013-12-15 23:22:39 -05:00 |
|
Aidan Brady
|
98c56904e1
|
Merge “Fix crash”
|
2013-12-15 23:15:01 -05:00 |
|
Aidan Brady
|
50b98674ed
|
Fix crashes
|
2013-12-15 23:01:36 -05:00 |
|
Aidan Brady
|
2404e7416a
|
Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
|
2013-12-15 19:08:16 -05:00 |
|
Aidan Brady
|
8b0d18e469
|
Tiny cleanup
|
2013-12-15 19:08:13 -05:00 |
|
Aidan C. Brady
|
37a1a0ab40
|
Jetpack and gas mask practically done :)
|
2013-12-15 18:54:43 -05:00 |
|
Aidan Brady
|
d21ef524a0
|
Work on jetpacks/scuba stuff
|
2013-12-15 16:07:30 -05:00 |
|
Aidan Brady
|
8057d605a1
|
Merge branch 'master' into development
|
2013-12-15 14:19:57 -05:00 |
|
Aidan Brady
|
5cd968f09c
|
Fixed bin bug
|
2013-12-15 14:19:16 -05:00 |
|
Aidan Brady
|
a6887eb813
|
Fixed tank crash
|
2013-12-15 00:43:47 -05:00 |
|
Aidan Brady
|
945aff6986
|
Fixed gas/fluid transfer
|
2013-12-15 00:03:45 -05:00 |
|
Aidan Brady
|
f6043b6a62
|
Fixed miner issues
|
2013-12-14 23:45:51 -05:00 |
|
Aidan C. Brady
|
0414b0af99
|
Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
|
2013-12-14 22:54:32 -05:00 |
|
Aidan Brady
|
907bd10b0f
|
Merge branch 'master' into development
|
2013-12-14 22:50:48 -05:00 |
|
Aidan Brady
|
c73259f092
|
Killed off old TE API, moved PipeUtils to proper loc
|
2013-12-14 22:50:37 -05:00 |
|
Aidan C. Brady
|
8edd4fcfa7
|
Work on Chemical Infuser/Formulator official implementation (without models yet)
|
2013-12-14 22:29:25 -05:00 |
|
Aidan Brady
|
345aecb4db
|
Merge branch 'master' into development
|
2013-12-14 17:58:13 -05:00 |
|
Aidan Brady
|
9558c6f6ca
|
Fix GregTech conflict
|
2013-12-14 17:58:01 -05:00 |
|
Aidan C. Brady
|
79f77dbdeb
|
Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
|
2013-12-14 15:36:16 -05:00 |
|
Ben Spiers
|
a92a05a720
|
Make universal cables display power a bit more nicely.
|
2013-12-14 20:33:17 +00:00 |
|
Ben Spiers
|
32f113ad77
|
First steps towards more dynamic capacity system to allow for differing capacity of universal cables in the future. Will optimise later.
|
2013-12-14 20:32:32 +00:00 |
|
Aidan C. Brady
|
bb8b89b7e7
|
Work on dynamic rendering based on both buffer amount and average transfer
|
2013-12-14 15:30:41 -05:00 |
|
Aidan C. Brady
|
1e1eabfd5e
|
Even more localization, fixed a few tiny bugs
|
2013-12-14 15:13:12 -05:00 |
|
Aidan C. Brady
|
acdbf1f3cb
|
Core code for Fluid and Gas networks
|
2013-12-14 00:36:52 -05:00 |
|
Aidan Brady
|
efc98114e8
|
Core code for new energy framework. Still to do FluidNetwork and GasNetwork.
|
2013-12-13 23:42:27 -05:00 |
|
Aidan Brady
|
ea57bb5990
|
Fix crash
|
2013-12-13 23:03:20 -05:00 |
|
Aidan Brady
|
a05870a2ef
|
A few fixes
|
2013-12-13 17:13:46 -05:00 |
|
Aidan Brady
|
0a0f3a1779
|
Minor cleanup
|
2013-12-13 07:02:13 -05:00 |
|
Aidan Brady
|
705b2b4528
|
Add TE support to Universal Cables, implemented Mechanical Pipe suck mode
|
2013-12-13 00:16:06 -05:00 |
|
Aidan Brady
|
cb69ff842e
|
Fix bounds on big transmitters
|
2013-12-13 00:01:54 -05:00 |
|
Aidan Brady
|
c85bb7f9cc
|
Add missing renderer
|
2013-12-12 23:36:55 -05:00 |
|
Aidan Brady
|
74d41073a6
|
Fixes, but getting an error for some reason
|
2013-12-12 23:08:16 -05:00 |
|
Aidan Brady
|
a68468b82e
|
Fix merge
|
2013-12-12 22:37:14 -05:00 |
|
Aidan Brady
|
11c7efd8fc
|
Merge branch 'api-change' into multipart-experimental-new
|
2013-12-12 22:36:00 -05:00 |
|
Aidan Brady
|
0e35aca15a
|
Rendering enhancements
|
2013-12-12 22:31:27 -05:00 |
|
Aidan Brady
|
6f99805443
|
Fix crash
|
2013-12-12 22:02:34 -05:00 |
|
Aidan Brady
|
4316103022
|
Fixes
|
2013-12-12 21:35:17 -05:00 |
|
Ben Spiers
|
55dd8f5bf9
|
Make other transmitters work visually again, make the unicable's transparency more of a smooth exponential decay type thing and remove it's weird noop constructor
|
2013-12-13 01:58:25 +00:00 |
|
Aidan Brady
|
2d5b633168
|
Work on stuff
|
2013-12-12 20:35:37 -05:00 |
|
Aidan Brady
|
11aa04a5df
|
A few charging fixes
|
2013-12-12 19:46:23 -05:00 |
|
Aidan Brady
|
9ecb7c20fd
|
More work on Infuser
|
2013-12-12 19:04:02 -05:00 |
|
Aidan Brady
|
43d3050b40
|
Work on Chemical Infuser
|
2013-12-12 18:33:56 -05:00 |
|
Aidan C. Brady
|
338da4d92c
|
Work on a more intuitive form of accepting gas in items and blocks
|
2013-12-12 16:54:55 -05:00 |
|
Ben Spiers
|
98c8068a0f
|
Get Mechanical Pipe rendering working a bit better.
|
2013-12-12 20:23:03 +00:00 |
|
Aidan C. Brady
|
85a2c981df
|
Fixed Adv Solar Generator config
|
2013-12-12 13:56:00 -05:00 |
|
Aidan Brady
|
31f8566a1f
|
Merge branch 'master' into multipart-experimental-new
Conflicts:
common/mekanism/common/Mekanism.java
|
2013-12-12 08:43:21 -05:00 |
|
Ben Spiers
|
c1318d998b
|
Merge, hopefully without screwing too much up.
|
2013-12-12 01:56:05 +00:00 |
|
Aidan Brady
|
faa127ddd8
|
Add textures for Sulfuric Gas & Sulfuric Acid
|
2013-12-11 20:46:39 -05:00 |
|
Aidan Brady
|
5a241ce8ee
|
Work on GUIs
|
2013-12-11 20:24:37 -05:00 |
|
Aidan Brady
|
6114463852
|
Work on TileEntity code of Chemical Formulator
|
2013-12-11 19:53:12 -05:00 |
|
Aidan Brady
|
7a3c678d76
|
Work on new machines
|
2013-12-11 18:26:10 -05:00 |
|
Aidan Brady
|
123ae05dcd
|
Cleaned up contractor code
|
2013-12-11 18:10:01 -05:00 |
|
Aidan Brady
|
2d626f2279
|
Work on Chemical Infuser & Chemical Formulator recipe system
|
2013-12-11 17:08:15 -05:00 |
|
Aidan C. Brady
|
7e48fa2743
|
Work on container code
|
2013-12-11 16:34:54 -05:00 |
|
Aidan C. Brady
|
a4e8158448
|
Add GUIs for T3 ore processing machinery
|
2013-12-10 18:51:16 -05:00 |
|
Aidan Brady
|
250ddadcf0
|
Dictionary! :)
|
2013-12-09 20:52:49 -05:00 |
|
Aidan Brady
|
3c4d776e24
|
Added lead ore processing
|
2013-12-09 18:30:50 -05:00 |
|
Aidan Brady
|
add3cf0bf6
|
Bug fixes!
|
2013-12-09 17:54:59 -05:00 |
|
Aidan Brady
|
ac31fc2b4e
|
More work on networking system, unstable
|
2013-12-09 17:34:53 -05:00 |
|
Aidan Brady
|
26f0f83574
|
Work on initial data system for jetpacks/gasmasks
|
2013-12-09 17:08:47 -05:00 |
|
Aidan Brady
|
44a69da8a1
|
Merge branch 'master' of https://github.com/aidancbrady/Mekanism
|
2013-12-09 17:00:29 -05:00 |
|
Aidan Brady
|
7506b8fed8
|
Fix particles
|
2013-12-09 17:00:21 -05:00 |
|
Aidan C. Brady
|
54a10af2d7
|
A few tiny fixes
|
2013-12-09 17:00:08 -05:00 |
|
Aidan C. Brady
|
5661b20b27
|
A few fixes
|
2013-12-09 11:56:48 -05:00 |
|
Aidan C. Brady
|
4035ba9b36
|
Add overlay for scuba tank
|
2013-12-09 09:52:49 -05:00 |
|
Aidan Brady
|
13b8c3f793
|
Fix MI config
|
2013-12-09 07:25:11 -05:00 |
|
Aidan Brady
|
4ebf11ed5a
|
Fix crash
|
2013-12-09 07:19:16 -05:00 |
|
Aidan Brady
|
781aef807c
|
Add lapis lazuli dust Enrichment Chamber recipe
|
2013-12-09 07:11:00 -05:00 |
|
Aidan Brady
|
4125ef57c6
|
minor changes
|
2013-12-08 21:40:00 -05:00 |
|
Aidan Brady
|
0d830d6136
|
Attempt a few jetpack fixes
|
2013-12-08 20:35:45 -05:00 |
|
Aidan Brady
|
8b25c1acb3
|
Attempt to fix a few jetpack bugs
|
2013-12-08 20:22:04 -05:00 |
|
Aidan Brady
|
af1f32da8e
|
Fix double chest crash
|
2013-12-08 19:22:59 -05:00 |
|
Aidan Brady
|
d2753abc92
|
Fixed tiny factory sort issue
|
2013-12-08 16:39:03 -05:00 |
|
Aidan C. Brady
|
ce629e218c
|
Fix IC2 charging
|
2013-12-08 16:10:52 -05:00 |
|
Aidan C. Brady
|
8289af18fd
|
Add configurable sound volume for all Mekanism sounds
|
2013-12-08 12:49:48 -05:00 |
|
Aidan Brady
|
eb8e02a39a
|
Fix a few bugs!
|
2013-12-08 12:39:26 -05:00 |
|
Aidan Brady
|
97bf92375a
|
Add class enumerator for future class stuff
|
2013-12-08 00:43:20 -05:00 |
|
Aidan Brady
|
62bc5c267a
|
Fixed weird jetpack particles
|
2013-12-07 23:51:07 -05:00 |
|
Aidan Brady
|
314f4b3082
|
A few rendering fixes, fixed VoiceServer hanging
|
2013-12-07 23:28:13 -05:00 |
|
Aidan C. Brady
|
5d742ce200
|
Teleporters are actually worth it now.
|
2013-12-07 23:02:25 -05:00 |
|
Aidan Brady
|
c2737ff064
|
Work on things, may be unstable
|
2013-12-07 17:06:11 -05:00 |
|
Aidan Brady
|
5e50e920a6
|
Add potion resistance to gas mask
|
2013-12-07 00:55:35 -05:00 |
|
Aidan Brady
|
916859c21d
|
Added description text to machines
|
2013-12-06 20:03:25 -05:00 |
|
Aidan C. Brady
|
84ab705170
|
Start work on new description system, UNSTABLE BUILD
|
2013-12-06 16:44:08 -05:00 |
|
Aidan C. Brady
|
cb9900bbc7
|
Work on gas masks/scuba gear stuff
|
2013-12-06 15:26:44 -05:00 |
|
Aidan C. Brady
|
f982eb851c
|
Remove now-unused generics
|
2013-12-06 07:57:26 -05:00 |
|
Aidan Brady
|
ecfe9a43b9
|
Fixes!
|
2013-12-06 07:26:48 -05:00 |
|
Aidan Brady
|
c282965fee
|
Complete merge
|
2013-12-05 22:39:54 -05:00 |
|
Aidan Brady
|
d36409f4b0
|
Merge branch 'master' into multipart-experimental-new
Conflicts:
common/mekanism/client/model/ModelJetpack.java
common/mekanism/client/render/ModelCustomArmor.java
common/mekanism/common/Mekanism.java
common/mekanism/common/item/ItemJetpack.java
common/mekanism/common/tileentity/TileEntityUniversalCable.java
common/mekanism/induction/client/render/RenderWire.java
common/mekanism/induction/common/tileentity/TileEntityMultimeter.java
common/mekanism/induction/common/tileentity/TileEntityWire.java
common/mekanism/induction/common/wire/PartUniversalConductor.java
common/mekanism/induction/common/wire/PartWire.java
|
2013-12-05 22:37:27 -05:00 |
|
Aidan Brady
|
449822fef2
|
Fixed build
|
2013-12-05 22:33:28 -05:00 |
|
Aidan Brady
|
9c0358b38e
|
Removed multimeter
|
2013-12-05 22:03:36 -05:00 |
|
Aidan Brady
|
c3a985f273
|
Kill off wires for the last time, fix up jetpacks
|
2013-12-05 21:10:15 -05:00 |
|
Aidan Brady
|
fb350e43f0
|
Cool stuff!
|
2013-12-05 16:42:00 -05:00 |
|
Aidan C. Brady
|
a204df448f
|
Work on jetpacks
|
2013-12-05 15:50:38 -05:00 |
|
Aidan Brady
|
73c41f7863
|
Sorters can now directly eject into inventories
|
2013-12-04 22:17:56 -05:00 |
|
Aidan Brady
|
b84445c9ea
|
Smarter Logistical Transporter future insert calculation
|
2013-12-04 22:04:51 -05:00 |
|
Aidan Brady
|
6cc198cf0b
|
Bins are nice to hoppers now.
|
2013-12-04 21:55:56 -05:00 |
|
Aidan Brady
|
38dda1d18e
|
Fix name, add a few more particle effects
|
2013-12-04 20:01:27 -05:00 |
|
Aidan Brady
|
64f681c263
|
Jetpack work!
|
2013-12-04 19:14:27 -05:00 |
|
Aidan Brady
|
aca0692cec
|
Fix a few jetpack things
|
2013-12-04 17:22:00 -05:00 |
|
Aidan Brady
|
bf9d48d86f
|
Work on jetpacks - specifically networking fixes and sounds!
|
2013-12-04 16:53:58 -05:00 |
|
Aidan C. Brady
|
2914a4201d
|
Fix a few bugs, work on jetpack networking
|
2013-12-04 15:43:03 -05:00 |
|
Aidan Brady
|
91eafd02aa
|
Fixed IC2 tiers
|
2013-12-04 07:19:43 -05:00 |
|
Aidan Brady
|
82f7b0f761
|
Work on jetpack
|
2013-12-04 07:16:28 -05:00 |
|
Aidan Brady
|
7182d07cbd
|
Bugfixes and the beginnings of jetpacks!
|
2013-12-03 23:36:06 -05:00 |
|
Aidan Brady
|
a228c659cd
|
Remove RecipeLoader
|
2013-12-03 21:57:03 -05:00 |
|
Aidan Brady
|
1cfdd805f3
|
Work on jetpack
|
2013-12-03 21:49:12 -05:00 |
|
Aidan Brady
|
e9b18c1a35
|
Cleanup
|
2013-12-03 18:00:06 -05:00 |
|
Aidan Brady
|
8f4ac31871
|
Minor cleanup
|
2013-12-03 17:46:48 -05:00 |
|
Aidan Brady
|
f492ff7ee9
|
Hopefully fixed ENet crash with IC2
|
2013-12-03 16:57:57 -05:00 |
|
Aidan Brady
|
afe85f9215
|
Fix some pesky bugs and crashes
|
2013-12-03 16:56:03 -05:00 |
|
Aidan C. Brady
|
54fa437cb1
|
A few fixes
|
2013-12-03 16:50:00 -05:00 |
|
Aidan C. Brady
|
a45a6e43f3
|
Fix solar generation
|
2013-12-03 16:23:45 -05:00 |
|
Aidan C. Brady
|
b60d6c172f
|
Fix pressurized tube render
|
2013-12-03 16:23:08 -05:00 |
|
Aidan C. Brady
|
ef8b6c1c78
|
Fix gas render in mech pipe
|
2013-12-03 11:24:23 -05:00 |
|
Aidan C. Brady
|
7956748e8f
|
Fix connections
|
2013-12-03 11:16:30 -05:00 |
|
Aidan C. Brady
|
a4d1b191e9
|
Re-add BC stuff
|
2013-12-03 11:10:14 -05:00 |
|
Aidan C. Brady
|
5e9a282eff
|
A few fixes
|
2013-12-03 11:07:03 -05:00 |
|
Aidan C. Brady
|
9a4147ab7c
|
Add TE and UE support to multipart cables
|
2013-12-03 11:03:03 -05:00 |
|
Aidan C. Brady
|
5dc8d2fc80
|
Multipart work
|
2013-12-03 10:54:50 -05:00 |
|
Aidan C. Brady
|
09b3a98a2a
|
Work on multipart
|
2013-12-03 08:42:13 -05:00 |
|
Aidan Brady
|
934d537230
|
Fix a few issues
|
2013-12-03 07:18:40 -05:00 |
|
Aidan Brady
|
e848849ed8
|
Revert "Kill BuildCraft energy support once and for all, thanks to the excellent work of KingLemming."
This reverts commit 1f2e792146 .
|
2013-12-03 06:57:53 -05:00 |
|
Aidan Brady
|
4ccd60f81d
|
Fixed wire textures
|
2013-12-03 06:54:59 -05:00 |
|
Aidan Brady
|
360c980712
|
A bit of work on multipart
|
2013-12-02 23:44:34 -05:00 |
|
Aidan Brady
|
06b806e871
|
Add wildcard support to entire recipe system
|
2013-12-02 23:26:18 -05:00 |
|
Aidan Brady
|
47fd7799ff
|
Fix up recipe system to accept wildcard blocks
|
2013-12-02 22:42:54 -05:00 |
|
Aidan Brady
|
a3fa18cb80
|
Remove superconductor, make Heat Gen cheaper
|
2013-12-02 22:35:46 -05:00 |
|
Aidan Brady
|
50b7870388
|
A few attempts to get multipart working. @unpairedbracket, I don’t know what the hell I’m doing, you’re gonna need to go over this.
|
2013-12-02 22:14:21 -05:00 |
|
Aidan Brady
|
5d8e21b776
|
Merge branch 'master' of https://github.com/aidancbrady/Mekanism into multipart-experimental-new
Conflicts:
common/mekanism/api/gas/GasNetwork.java
common/mekanism/api/gas/GasTransmission.java
common/mekanism/api/transmitters/DynamicNetwork.java
common/mekanism/client/EnergyClientUpdate.java
common/mekanism/client/FluidClientUpdate.java
common/mekanism/client/GasClientUpdate.java
common/mekanism/client/render/tileentity/RenderUniversalCable.java
common/mekanism/common/EnergyNetwork.java
common/mekanism/common/FluidNetwork.java
common/mekanism/common/InventoryNetwork.java
common/mekanism/common/Mekanism.java
common/mekanism/common/item/ItemConfigurator.java
common/mekanism/common/tileentity/TileEntityLogisticalTransporter.java
common/mekanism/common/tileentity/TileEntityMechanicalPipe.java
common/mekanism/common/tileentity/TileEntityPressurizedTube.java
common/mekanism/common/tileentity/TileEntityTransmitter.java
common/mekanism/common/tileentity/TileEntityUniversalCable.java
common/mekanism/common/util/CableUtils.java
resources/assets/mekanism/textures/blocks/LiquidEnergy.png.mcmeta
|
2013-12-02 21:45:40 -05:00 |
|
Aidan Brady
|
dc8a00a140
|
Fix a few issues
|
2013-12-02 21:37:11 -05:00 |
|
Aidan Brady
|
30237b34ac
|
Delete old textures, add Copper and Tin blocks
|
2013-12-02 20:52:44 -05:00 |
|
Aidan Brady
|
c0c003a337
|
Fix a crash
|
2013-12-02 19:29:49 -05:00 |
|
Aidan Brady
|
1f2e792146
|
Kill BuildCraft energy support once and for all, thanks to the excellent work of KingLemming.
|
2013-12-02 19:19:23 -05:00 |
|
Aidan Brady
|
75cccf96a8
|
Slightly speed up Digital Miner
|
2013-12-02 18:54:21 -05:00 |
|
Aidan Brady
|
067c55491a
|
Make deserts allow for 50% more solar generation
|
2013-12-02 18:38:18 -05:00 |
|
Aidan Brady
|
f81139a297
|
Update donators list :)
|
2013-12-02 18:32:12 -05:00 |
|
Aidan Brady
|
b75cbc5eaf
|
Fix crash
|
2013-12-02 18:12:33 -05:00 |
|
Aidan C. Brady
|
57ffc071cf
|
Fixed a crash and wire names
|
2013-12-02 17:11:39 -05:00 |
|
Aidan C. Brady
|
57caab2062
|
Wire fixes
|
2013-12-02 17:04:41 -05:00 |
|
Aidan C. Brady
|
d470ac1901
|
Some wire fixes
|
2013-12-02 16:39:43 -05:00 |
|
Aidan C. Brady
|
5c2c8e15cb
|
Add in necessary models
|
2013-12-02 12:41:00 -05:00 |
|
Aidan C. Brady
|
054cba30e3
|
Wire code cleanup!
|
2013-12-02 12:27:57 -05:00 |
|
Aidan C. Brady
|
6781af7447
|
Clean up wire code, remove fancy furnace thing as I'm going to be implementing another form of a low-end generator soon
|
2013-12-02 12:18:38 -05:00 |
|
Aidan C. Brady
|
e38cf10ef6
|
Merge branch 'universal-wires' of https://github.com/aidancbrady/Mekanism
|
2013-12-02 11:42:21 -05:00 |
|
Aidan C. Brady
|
bb1dceb064
|
Fix up Copper and Tin dust smelting recipes. Most recommended build as of now.
|
2013-12-02 11:38:27 -05:00 |
|
Aidan C. Brady
|
e9c39bcf3d
|
Fix ore gen
|
2013-12-02 11:32:45 -05:00 |
|
Aidan C. Brady
|
9290c76c05
|
Add custom Osmium Ore generation rates, generate Copper and Tin ores
|
2013-12-02 11:20:25 -05:00 |
|
Aidan C. Brady
|
20d3eb42b2
|
Add needed ingot recipes & textures
|
2013-12-02 09:24:52 -05:00 |
|
Calclavia
|
7396daa038
|
Re-enabled multipart
|
2013-12-02 21:41:17 +08:00 |
|
Calclavia
|
29741b999a
|
Merge branch 'master' into universal-wires
|
2013-12-02 21:38:03 +08:00 |
|
Calclavia
|
11adb89791
|
Removed unnessary "instanceof"
|
2013-12-02 21:17:25 +08:00 |
|
Aidan C. Brady
|
1e51ddfa9a
|
Add config option to override UE ratios
|
2013-12-02 07:59:52 -05:00 |
|
Aidan C. Brady
|
4a499d6dac
|
Fix tank rendering, make Configurator serve as a BuildCraft wrench
|
2013-12-02 07:55:14 -05:00 |
|
Aidan Brady
|
5eba673468
|
Fixed Obsidian TNT render
|
2013-12-02 07:19:22 -05:00 |
|
Calclavia
|
41415ab683
|
Placed UE higher in priority for energy production
|
2013-12-02 20:16:53 +08:00 |
|
Aidan Brady
|
684e1d6718
|
Add OreDict registrations, fix charcoal block reverse crafting
|
2013-12-02 07:16:09 -05:00 |
|
Calclavia
|
07332ca245
|
Merge branch 'master' into universal-wires
Conflicts:
common/mekanism/induction/common/MekanismInduction.java
resources/assets/mekanism/lang/en_US.lang
|
2013-12-02 19:47:38 +08:00 |
|
Aidan Brady
|
e42ab62e2a
|
Begin work on copper and tin ore and ingots :)
|
2013-12-01 21:58:35 -05:00 |
|
Aidan Brady
|
83bca26455
|
Remove Maganese Alloy in hopes for better balance, fixed several GUI color issues as well as Osmium Ore darkness
|
2013-12-01 17:45:19 -05:00 |
|
Aidan Brady
|
7ebd132b6e
|
Fixed teslas, merged Electrostatic Linker into Configurator
|
2013-12-01 14:03:00 -05:00 |
|
Aidan Brady
|
f55d3ac874
|
Added Factory input slot distribution, configurable voice ports, fixed several bugs
|
2013-12-01 12:38:34 -05:00 |
|
Calclavia
|
c1d5e2bc60
|
Fixed non-multipart insulated wire texture
|
2013-12-01 18:05:27 +08:00 |
|
Calclavia
|
5865063fa0
|
Attempt to fix reflection InvocationTargetException
|
2013-12-01 17:39:22 +08:00 |
|
Calclavia
|
180401b8ef
|
Forgot to print-stack-trace
|
2013-12-01 17:17:19 +08:00 |
|
Calclavia
|
a1ae16b82c
|
Added console output for multipart disable
|
2013-12-01 17:08:19 +08:00 |
|
Calclavia
|
bf04c53415
|
Merge branch 'master' into universal-wires
|
2013-12-01 17:07:13 +08:00 |
|
Calclavia
|
a7a5248b24
|
Made logger set parent
|
2013-12-01 17:07:08 +08:00 |
|
Calclavia
|
3cca65f2cd
|
Fixed non-multipart wire textures
|
2013-12-01 17:02:39 +08:00 |
|
Calclavia
|
57bcf19035
|
Fixed connecting to un-interfacable TE sides
|
2013-12-01 15:27:58 +08:00 |
|
Calclavia
|
ab32553c2d
|
Added TE support for universal wires
|
2013-12-01 15:14:17 +08:00 |
|
Calclavia
|
7c79270259
|
Fixed multipart wire render
|
2013-12-01 14:50:06 +08:00 |
|
Calclavia
|
10bbcff077
|
Fixed Multipart wires not loading
|
2013-12-01 14:30:54 +08:00 |
|
Calclavia
|
4804f8f335
|
Merge branch 'master' into universal-wires
|
2013-12-01 13:58:18 +08:00 |
|
Calclavia
|
892cf8fb07
|
Fixed OreDict crashing due to loading before item/block initiation
|
2013-12-01 13:58:12 +08:00 |
|
Calclavia
|
f4d95a8129
|
Merge branch 'master' into universal-wires
|
2013-12-01 13:54:34 +08:00 |
|
Calclavia
|
7a2155c869
|
Made vanilla electric furnace load when Mekanism Generators is not loaded
|
2013-12-01 13:54:05 +08:00 |
|
Calclavia
|
43b4306f4b
|
Got Induction module loading again
|
2013-12-01 13:51:33 +08:00 |
|
Calclavia
|
361d1ae380
|
Readded vanilla electric furnace but it's DISABLED by default
|
2013-12-01 13:50:02 +08:00 |
|
Calclavia
|
0205d7722e
|
Readded universal wires into Mekanism Induction
|
2013-12-01 13:46:15 +08:00 |
|
Aidan Brady
|
4dec7c01ff
|
Fixed OreDict integration
|
2013-12-01 00:29:08 -05:00 |
|
Calclavia
|
deaed38c50
|
Merge branch 'master' of https://github.com/aidancbrady/Mekanism
|
2013-12-01 13:23:48 +08:00 |
|
Calclavia
|
f560eb3c39
|
Moved OreDict to init phase
|
2013-12-01 13:23:27 +08:00 |
|
Aidan Brady
|
e562562661
|
Merge branch 'master' of https://github.com/aidancbrady/Mekanism
|
2013-12-01 00:16:04 -05:00 |
|
Aidan Brady
|
f853deb9c0
|
fixed API once again! :)
|
2013-12-01 00:15:52 -05:00 |
|
Calclavia
|
8588c90881
|
Added energy tablet to OreDict for external recipe usage
|
2013-12-01 13:09:12 +08:00 |
|
Aidan Brady
|
406be48069
|
Revert "Added energy tablet to OreDict for recipes"
This reverts commit de4742e65c .
|
2013-12-01 00:04:20 -05:00 |
|
Aidan Brady
|
36218ae086
|
Merge branch 'master' of https://github.com/aidancbrady/Mekanism
commit de4742e65c .
|
2013-12-01 00:04:08 -05:00 |
|
Aidan Brady
|
199ce13dcd
|
Re-add EnumColor to API!
|
2013-12-01 00:03:40 -05:00 |
|
Calclavia
|
de4742e65c
|
Added energy tablet to OreDict for recipes
|
2013-12-01 12:48:57 +08:00 |
|
Aidan Brady
|
5d949ec959
|
Fixed API for @micdoodle8
|
2013-11-30 23:19:24 -05:00 |
|
Aidan Brady
|
96d2a12948
|
Fixed that bug, @BevoLJ!
|
2013-11-30 13:06:44 -05:00 |
|
Aidan Brady
|
1be0d218af
|
Final fix for now - fixed electric machine GUIs
|
2013-11-30 12:48:22 -05:00 |
|
Aidan Brady
|
2c754cd506
|
Merge GasUtils into GasTransmission
|
2013-11-30 12:37:47 -05:00 |
|
Aidan Brady
|
0715a890bd
|
Fixed tank bug, thanks @Not_steve! Closes #553.
|
2013-11-30 12:34:18 -05:00 |
|
Aidan Brady
|
a4ab6db57b
|
Fixes!
|
2013-11-30 12:29:49 -05:00 |
|
Aidan Brady
|
0c618a1cf3
|
Localization & gas fixes
|
2013-11-30 11:31:18 -05:00 |
|
Aidan Brady
|
14fb453bb8
|
Change the way UE integration works in Universal Cables
|
2013-11-30 01:28:40 -05:00 |
|
Aidan Brady
|
150c5dee0b
|
Fix RF support
|
2013-11-30 01:02:44 -05:00 |
|
Aidan Brady
|
82933393c7
|
Fix a minor tank update issue
|
2013-11-30 00:47:11 -05:00 |
|
Aidan Brady
|
ba32a2b112
|
More localization support!
|
2013-11-30 00:43:54 -05:00 |
|
Aidan Brady
|
b224a01f39
|
Work on localization support, move around some API classes to make better compatibility
|
2013-11-30 00:28:02 -05:00 |
|
Aidan Brady
|
686cca5032
|
A few fixes and enhancements
|
2013-11-29 21:31:39 -05:00 |
|
Aidan Brady
|
0f61c5d50c
|
A few fixes, and fancy Configurator GUI hovering!
|
2013-11-29 19:11:07 -05:00 |
|
Aidan Brady
|
30eff7f7fb
|
Overthought something!
|
2013-11-29 18:22:43 -05:00 |
|
Aidan Brady
|
69d1c5961e
|
Fix batteries
|
2013-11-29 18:19:18 -05:00 |
|
Aidan Brady
|
cd62f593fa
|
Fix possible infinite loop
|
2013-11-29 17:37:00 -05:00 |
|
Aidan Brady
|
2e86b2a471
|
Better direct energy outputting
|
2013-11-29 17:17:01 -05:00 |
|
Aidan Brady
|
3d167922be
|
Add IDeepStorageUnit support
|
2013-11-29 15:39:37 -05:00 |
|
Aidan Brady
|
65b305b27d
|
Temp crash fix
|
2013-11-29 13:33:36 -05:00 |
|
Aidan Brady
|
20162970d8
|
Fixes!
|
2013-11-29 13:04:39 -05:00 |
|
Aidan Brady
|
82bae6e4bd
|
Rendering fixes!
|
2013-11-28 22:20:24 -05:00 |
|
Aidan Brady
|
00b4c6f3e3
|
Rendering and transmitter performance enhancements, finish Rotary Condensentrator for the most part
|
2013-11-28 21:43:53 -05:00 |
|
Aidan Brady
|
ccae995242
|
Work on Rotary Condensentrator, fixed an issue with factories
|
2013-11-28 16:01:23 -05:00 |
|
Aidan Brady
|
ae580843aa
|
Temp fix for electrolytic separator crash
|
2013-11-28 12:13:17 -05:00 |
|
Aidan Brady
|
3d1020d8dd
|
Fix things!
|
2013-11-28 10:27:26 -05:00 |
|
Aidan Brady
|
fb3aa53eaf
|
Fix several bugs!
|
2013-11-28 10:13:06 -05:00 |
|
Aidan Brady
|
98e864cd8d
|
Work on that Rotary Condensentrator!
|
2013-11-27 23:42:54 -05:00 |
|
Aidan Brady
|
e06b8614a2
|
Fix Energy Cube inputting sides
|
2013-11-27 18:24:31 -05:00 |
|
Aidan Brady
|
419a295096
|
Work on Rotary Condensentrator, fix IC2 energy integration (mostly)
|
2013-11-27 18:17:44 -05:00 |
|
Aidan Brady
|
22fe896bcd
|
Finish multi-ID machine support
|
2013-11-27 16:17:10 -05:00 |
|
Aidan Brady
|
96ba50a673
|
Many fixes!
|
2013-11-27 13:24:13 -05:00 |
|
Aidan Brady
|
6739d81a12
|
Miners are better for servers now. Please update!
|
2013-11-26 23:31:42 -05:00 |
|
Aidan Brady
|
b950960aea
|
Dynamic Tanks are now 300% better.
|
2013-11-26 22:44:14 -05:00 |
|
Aidan Brady
|
dacc68e6c6
|
Gas API completely overhauled. Sorry @micdoodle8 :(
General cleanup, pressurized tubes are 40 times more efficient, a few enhancements, Miners balanced.
|
2013-11-26 20:11:26 -05:00 |
|
Aidan Brady
|
c2c4c4f93f
|
Fixed Factory shift-click support
|
2013-11-25 18:44:52 -05:00 |
|
Aidan Brady
|
e2e7274cd6
|
Fix a few bugs. Signing off, see you all later!
|
2013-11-25 18:23:24 -05:00 |
|
Aidan Brady
|
e6016d7341
|
Fix item rendering in transporters
|
2013-11-25 18:10:21 -05:00 |
|
Aidan Brady
|
14259f2251
|
Last-minute recalculation for Diversion Transporters
|
2013-11-25 16:57:57 -05:00 |
|
Aidan Brady
|
028c6f8aea
|
Fixed pixlepix’s diversion transporter
|
2013-11-25 16:50:55 -05:00 |
|
Aidan Brady
|
19feb2e602
|
Fixes by the dozen
|
2013-11-25 16:34:59 -05:00 |
|
Aidan Brady
|
824817cef5
|
Merge branch 'master' of https://github.com/aidancbrady/Mekanism
|
2013-11-25 13:33:52 -05:00 |
|
Aidan Brady
|
0b70ed5dcc
|
Work on an overhaul of the Logistical Transporter network. Don’t use, completely untested.
|
2013-11-25 13:33:42 -05:00 |
|
Calclavia
|
79354580b1
|
Added TE compatibility to multimeter
|
2013-11-25 19:18:24 +08:00 |
|
Aidan Brady
|
d0253444c1
|
Tiny cleanup, off to bed. Tomorrow I implement a more advanced transporter system.
|
2013-11-25 00:14:56 -05:00 |
|
Aidan Brady
|
a360255f63
|
Greatly improve performance of transmitter networks, improved logistics of Mechanical Pipe
|
2013-11-25 00:00:26 -05:00 |
|
Aidan Brady
|
c10ba92522
|
Connected Dynamic Glass textures :)
|
2013-11-24 19:30:52 -05:00 |
|
Aidan Brady
|
38d9bdd1d2
|
Start work on a connected texture renderer, remove old textures, fix recipes for Vaygrim’s issue (closes #481)
|
2013-11-24 18:54:11 -05:00 |
|
Aidan Brady
|
bd701fb546
|
Made all factories show up in NEI
|
2013-11-24 18:04:45 -05:00 |
|
Aidan C. Brady
|
591c6592a4
|
Fix delayed side setting with Sorter
|
2013-11-24 17:40:27 -05:00 |
|
Aidan C. Brady
|
7c47043d37
|
A few minor enhancements
|
2013-11-24 16:35:01 -06:00 |
|
Aidan C. Brady
|
fea5e8dab7
|
Pressurized Tubes now render gas in connected block bounds dynamically
|
2013-11-24 16:01:35 -06:00 |
|
Aidan C. Brady
|
afae26f9b8
|
Rendering enhancements! Mechanical Pipes now function better and use the large Transmitter model.
|
2013-11-24 15:44:16 -06:00 |
|
Aidan C. Brady
|
59b945a33f
|
Fixed Model3D textures, fixed error spam on world load, fixed Digital Miner breaking blocks on top, general code cleanup
|
2013-11-24 12:12:42 -06:00 |
|
Aidan C. Brady
|
de3ee34743
|
FIxed ObsidianTNT mapping
|
2013-11-24 08:27:52 -06:00 |
|
Aidan C. Brady
|
dfda7547cc
|
Fix Obsidian Ingot recipe
|
2013-11-24 08:19:50 -06:00 |
|
Aidan C. Brady
|
d5af842037
|
Fix a few bugs in Factory and Configuration GUI
|
2013-11-24 07:53:14 -06:00 |
|
Aidan C. Brady
|
009ee3a885
|
Add shift-click support and configurable usage to Digital Miner
|
2013-11-23 21:25:37 -06:00 |
|
Aidan C. Brady
|
dca7663de9
|
Fix factories
|
2013-11-23 15:21:01 -05:00 |
|
Aidan C. Brady
|
a27582971b
|
Neatened up Diversion Transporter code
|
2013-11-23 15:01:18 -05:00 |
|
Aidan C. Brady
|
a848b11582
|
Fixed crash with Electrolytic Separator
|
2013-11-23 14:44:28 -05:00 |
|
Aidan
|
5b690e9bfb
|
Merge pull request #461 from pixlepix/master
Logistical Diverter
|
2013-11-23 11:44:03 -08:00 |
|
Aidan C. Brady
|
22c07254fd
|
Purification, Compressing, and Combining factories :)
|
2013-11-23 14:36:50 -05:00 |
|
Aidan Brady
|
4a5df9f922
|
Fixed tesla texture
|
2013-11-23 10:42:23 -05:00 |
|
pixlepix
|
45b449078c
|
Added CC peripheral support for digital miner
|
2013-11-23 09:04:05 -05:00 |
|
pixlepix
|
dc1743d517
|
Divertion transporter fixes, including name change
|
2013-11-23 07:28:01 -05:00 |
|
pixlepix
|
51225ba715
|
Logistical diverter texture
|
2013-11-23 07:28:01 -05:00 |
|
pixlepix
|
2ecb10cbca
|
Added Logistical Diverter
|
2013-11-23 07:28:01 -05:00 |
|
Aidan Brady
|
4c68aa2ca2
|
Fix machines being able to be placed facing up or down
|
2013-11-23 00:23:56 -05:00 |
|
Aidan Brady
|
2ef3b1be6c
|
Make that miner require a robit!
|
2013-11-23 00:10:57 -05:00 |
|
Aidan Brady
|
f5d620b6a0
|
Fix sorter auto-orient
|
2013-11-23 00:01:44 -05:00 |
|
Aidan Brady
|
10da5406de
|
RF! :D
|
2013-11-22 23:36:18 -05:00 |
|
Aidan C. Brady
|
a9fde31c97
|
Fix client/server item accepting issue on contractor
|
2013-11-22 21:25:06 -05:00 |
|
Aidan C. Brady
|
0adc0dc75e
|
Attempt to use my own unit system
|
2013-11-22 20:58:49 -05:00 |
|
Aidan C. Brady
|
a3d200291c
|
GUI work...
|
2013-11-22 20:39:44 -05:00 |
|
Aidan C. Brady
|
649f128d76
|
Work on textures
|
2013-11-22 20:27:27 -05:00 |
|
Aidan C. Brady
|
cc46bebc43
|
Teslas are FIXED! :)
|
2013-11-22 20:00:18 -05:00 |
|
Aidan C. Brady
|
e44519dc7d
|
A ton of bug fixes, working on fixing teslas
|
2013-11-22 19:32:06 -05:00 |
|
Aidan C. Brady
|
dc925798b0
|
Hopefully fixed crash
|
2013-11-22 12:09:04 -05:00 |
|
Aidan C. Brady
|
df70da8bd0
|
Fix another crash
|
2013-11-22 07:34:03 -05:00 |
|
Aidan Brady
|
ace1365d0f
|
Aw yeah! Better GUI packets for Miner. Heading to bed guys, see ya tomorrow!
|
2013-11-21 22:30:01 -05:00 |
|
Aidan Brady
|
0e2d2917d1
|
Remove Capacitor and Empty Capacitor, fix mouses, made sorter and miner maintain configuration
|
2013-11-21 21:37:03 -05:00 |
|
Aidan Brady
|
5f2545d8e8
|
A few fixes and new mechanics
|
2013-11-21 20:31:28 -05:00 |
|
Aidan Brady
|
41eda67517
|
Fixed miner filter issue.
|
2013-11-21 19:37:13 -05:00 |
|
Aidan
|
c9ea74b013
|
Merge pull request #451 from pixlepix/master
Made robit look up on chargepad
|
2013-11-21 16:36:33 -08:00 |
|
pixlepix
|
72909b7657
|
Made robit look up on chargepad?
|
2013-11-21 19:27:39 -05:00 |
|
Aidan Brady
|
f53153cfd4
|
ANOTHER donator? Whoa! Thanks so much Greylocke :)
|
2013-11-21 19:17:32 -05:00 |
|
Aidan Brady
|
b7c7f58f2c
|
Fix up Robit pickup AI, and update donator cape list! Thanks ejmiv89! :)
|
2013-11-21 19:06:22 -05:00 |
|
Aidan Brady
|
6ff12e2c81
|
Merge branch 'master' of https://github.com/aidancbrady/Mekanism
|
2013-11-21 18:57:17 -05:00 |
|
Aidan Brady
|
85ad41df74
|
Fixed teslas!
|
2013-11-21 18:57:07 -05:00 |
|
pixlepix
|
1e2603d5fb
|
Added Robit Item Pickup.
|
2013-11-21 18:51:22 -05:00 |
|
Aidan Brady
|
57c16a0916
|
Don’t replace furnaces, that was for ModJam
|
2013-11-21 18:31:15 -05:00 |
|
Aidan Brady
|
25f1a72a16
|
Active management for that Miner.
|
2013-11-21 18:29:22 -05:00 |
|
Aidan Brady
|
323690ffdb
|
Hopefully fixed tesseract outputting
|
2013-11-21 17:19:59 -05:00 |
|
Aidan Brady
|
796a5aa397
|
Fixed IC2/TE support.
|
2013-11-21 16:50:40 -05:00 |
|
Aidan C. Brady
|
d01d444753
|
This miner is pretty much done :)
|
2013-11-21 16:29:22 -05:00 |
|
Aidan C. Brady
|
1c674f4317
|
Some bounding block inventory management
|
2013-11-21 16:04:14 -05:00 |
|
Aidan C. Brady
|
68f3d28119
|
Bounding blocks for miner!
|
2013-11-21 14:35:33 -05:00 |
|
Aidan Brady
|
44ca9d1067
|
Start work on bounding blocks
|
2013-11-21 08:44:59 -05:00 |
|
Aidan Brady
|
890de9446b
|
Model positioning fixes! Next is lasers and/or multiblock!
|
2013-11-20 21:17:23 -05:00 |
|
Aidan Brady
|
34f300cf6f
|
Begin implementing that sexy model
don’t recommend this build for personal use
|
2013-11-20 20:28:06 -05:00 |
|
Aidan Brady
|
8ce5876200
|
Some new logistics, preparing for model
|
2013-11-20 19:36:39 -05:00 |
|
Aidan Brady
|
222ce67e83
|
Miner kinda works!
|
2013-11-20 18:51:45 -05:00 |
|
Aidan Brady
|
e33775fec9
|
Fix tiny filter issue
|
2013-11-20 18:28:09 -05:00 |
|
Aidan Brady
|
1f3a82c3f0
|
Miner work! Starting on actual operation algorithms.
|
2013-11-20 18:17:10 -05:00 |
|
Aidan C. Brady
|
789c5dbf45
|
Some work on algorithm
|
2013-11-20 16:12:54 -05:00 |
|
Aidan C. Brady
|
7b3edc142e
|
GUI and networking fixes - I think the GUI is finished.
|
2013-11-20 15:15:02 -05:00 |
|
Aidan C. Brady
|
9673b9c7f8
|
Merge branch 'master' of https://github.com/aidancbrady/Mekanism
|
2013-11-20 11:01:27 -05:00 |
|
Aidan C. Brady
|
14d557cbe5
|
Some work on things, got rid of version constants, they're supposed to differ per module.
|
2013-11-20 11:01:13 -05:00 |
|
Calclavia
|
f8e7363483
|
Fixed multimeter packet update
|
2013-11-20 21:23:42 +08:00 |
|
Calclavia
|
665b857b94
|
Changed the battery recipe
|
2013-11-20 20:40:58 +08:00 |
|
Calclavia
|
132dcef0f6
|
Merge branch 'master' of https://github.com/aidancbrady/Mekanism
|
2013-11-20 20:28:06 +08:00 |
|
Calclavia
|
7694967d40
|
Fixed #427 - Tesla coil having no recipe
|
2013-11-20 20:27:51 +08:00 |
|
Calclavia
|
e986b3e664
|
Can't believe Aidan never used constants for Mekanism's versions
|
2013-11-20 20:26:51 +08:00 |
|
Calclavia
|
49e19b6793
|
Copy and paste derp
|
2013-11-20 20:21:40 +08:00 |
|
Calclavia
|
ce458d2e77
|
Revert "Fixed #433 - Electric bolt render NPE"
This reverts commit 92993e832d .
|
2013-11-20 20:21:10 +08:00 |
|
Aidan Brady
|
85f759e5e6
|
Merge branch 'master' of https://github.com/aidancbrady/Mekanism
|
2013-11-20 07:20:38 -05:00 |
|
Aidan Brady
|
2d1dabd6b2
|
Fix a few crashes
|
2013-11-20 07:20:32 -05:00 |
|
Calclavia
|
92993e832d
|
Fixed #433 - Electric bolt render NPE
|
2013-11-20 20:18:12 +08:00 |
|
Aidan Brady
|
7f9acda277
|
Aw yeah. This GUI…is coming together.
|
2013-11-19 22:27:28 -05:00 |
|
Aidan Brady
|
515cbf38c8
|
Fixes!
|
2013-11-19 22:13:35 -05:00 |
|
Aidan C. Brady
|
fc1cb7926c
|
Added in some descriptive text to the GUI.
|
2013-11-19 20:15:03 -05:00 |
|
Aidan C. Brady
|
73bf81ceaa
|
GUI is coming together! Still need to add reset button and map button actions, but layout is there.
|
2013-11-19 19:30:56 -05:00 |
|
Aidan C. Brady
|
d02d0ceadf
|
GUI work, kinda functions, but not really
|
2013-11-19 18:56:53 -05:00 |
|
Aidan C. Brady
|
7a74fb86ba
|
More work!
|
2013-11-19 18:16:26 -05:00 |
|
Aidan C. Brady
|
87f5bbcde2
|
Work on networking and GUIs of Digital Miner
|
2013-11-19 17:39:16 -05:00 |
|
Aidan C. Brady
|
c9deba55df
|
Provide replace stacks
|
2013-11-19 15:38:18 -05:00 |
|
Aidan C. Brady
|
3939000190
|
More work!
|
2013-11-19 12:29:50 -05:00 |
|
Aidan C. Brady
|
86b6474f35
|
Beginning foundations of Digital Miner.
|
2013-11-19 12:13:37 -05:00 |
|
Aidan Brady
|
ba66b6fc9f
|
Work on miner!
|
2013-11-18 22:15:03 -05:00 |
|
Aidan C. Brady
|
995207bcab
|
Start work on Miner, make the Bin only eject items when front side is clicked!
|
2013-11-18 15:33:14 -05:00 |
|
Aidan C. Brady
|
2594918bee
|
Double-click inserting on Bins
|
2013-11-18 14:50:59 -05:00 |
|
Aidan Brady
|
52d42e99f2
|
Fix ItemProxy leak
|
2013-11-17 23:37:02 -05:00 |
|
Aidan Brady
|
cc5d4281a2
|
Fix container item issue
|
2013-11-17 20:14:00 -05:00 |
|
Aidan Brady
|
0e0594a69b
|
Electric Chest charges when in inventory
|
2013-11-17 19:56:16 -05:00 |
|
Aidan Brady
|
a63a8902f2
|
Sounds should be fixed.
|
2013-11-17 19:25:52 -05:00 |
|
Aidan Brady
|
f988c54134
|
Hopefully the final fix
|
2013-11-17 19:16:40 -05:00 |
|
Aidan Brady
|
147fb7609d
|
Try removing extra url junk
|
2013-11-17 19:07:18 -05:00 |
|
Aidan Brady
|
40dd6798ea
|
Attempted sound fixes
Guaranteed not to work :)
|
2013-11-17 19:03:44 -05:00 |
|
Aidan Brady
|
6a4750f90b
|
Hopefully fixed sounds…
|
2013-11-17 13:39:40 -05:00 |
|
Aidan Brady
|
8095eb206c
|
Fix textures, hopefully fix sounds
|
2013-11-17 13:31:56 -05:00 |
|
Aidan Brady
|
8a79352563
|
Debugging sound system
|
2013-11-17 13:23:19 -05:00 |
|
Aidan Brady
|
17d36cad4d
|
Fixes and enhancements for TE
|
2013-11-17 10:55:20 -05:00 |
|
Aidan Brady
|
ae0edd50dc
|
Fix Universal Cable TE support, fix build.xml
|
2013-11-16 19:08:47 -05:00 |
|
Aidan Brady
|
67db8c522a
|
Fix TE support :)
|
2013-11-16 18:56:01 -05:00 |
|
Aidan Brady
|
e9382e64a9
|
Fixes!
|
2013-11-16 17:23:50 -05:00 |
|
Aidan C. Brady
|
f2fd5c382f
|
Merge branch 'master' of https://github.com/aidancbrady/Mekanism
|
2013-11-16 16:55:27 -05:00 |
|
Aidan C. Brady
|
57b1343311
|
Batteries are less buggy and more efficient
|
2013-11-16 16:55:20 -05:00 |
|
Aidan Brady
|
a2f667baf5
|
Fixed! :D
|
2013-11-16 13:38:34 -05:00 |
|
Aidan C. Brady
|
5954d51ad4
|
TE item support fixes
|
2013-11-16 12:56:43 -05:00 |
|
Aidan C. Brady
|
0616f28950
|
Fix test build
|
2013-11-16 12:49:41 -05:00 |
|
Aidan C. Brady
|
43440ebc4e
|
Register Induction module :)
|
2013-11-16 12:30:40 -05:00 |
|
Aidan C. Brady
|
19b6d30f4c
|
Fix crash
|
2013-11-16 12:27:43 -05:00 |
|
Aidan C. Brady
|
cc48b614ba
|
Remove wire
|
2013-11-16 12:26:49 -05:00 |
|
Aidan C. Brady
|
dc59bebc33
|
Fixed EM Contractor
|
2013-11-16 12:12:17 -05:00 |
|
Aidan C. Brady
|
15e3369f15
|
Fix TE crash (temp)
|
2013-11-16 11:06:17 -05:00 |
|
Aidan C. Brady
|
ed637e4eed
|
Follow Mekanism naming standards
|
2013-11-16 11:05:04 -05:00 |
|
Aidan C. Brady
|
53323279c7
|
MekanismInduction module - done!
Still need to configure the build
|
2013-11-16 10:21:37 -05:00 |
|
Aidan C. Brady
|
3d4625ddb9
|
Block-ID & Metadata based machine types, preparing for RI merge
|
2013-11-15 14:59:26 -05:00 |
|
Aidan C. Brady
|
3193f786cd
|
Official Redstone Flux support complete!
(As far as I know at least)
|
2013-11-15 12:06:03 -05:00 |
|
Aidan Brady
|
ec98b19ffb
|
Begin work on official TE2 integration :)
(Items done!)
|
2013-11-14 21:58:32 -05:00 |
|
Aidan Brady
|
8101ee2e26
|
A few fixes
|
2013-11-14 16:31:02 -05:00 |
|
Aidan C. Brady
|
be3063def5
|
Minor rendering enhancements
|
2013-11-14 08:12:09 -05:00 |
|
Aidan C. Brady
|
33283f5428
|
GL_LIGHTING
|
2013-11-14 07:48:18 -05:00 |
|
Aidan Brady
|
a29b637a0a
|
Minor tool cleanups
|
2013-11-13 22:43:58 -05:00 |
|
Aidan Brady
|
d08c6da830
|
Fixed tool harvest levels
|
2013-11-13 17:21:00 -05:00 |
|
Aidan Brady
|
c209f8233a
|
Bins are done :)
|
2013-11-13 16:19:41 -05:00 |
|
Aidan C. Brady
|
c9b5c7b51f
|
Some work on rendering, fixed sound error
|
2013-11-13 14:59:11 -05:00 |
|
Aidan C. Brady
|
f24c12044d
|
Merge branches 'master' and 'master' of https://github.com/aidancbrady/Mekanism
|
2013-11-13 08:12:34 -05:00 |
|
Aidan C. Brady
|
b04ff8d5cc
|
Bins only have accessible slots on top and bottom
|
2013-11-13 08:12:25 -05:00 |
|
Aidan Brady
|
4d55db7a73
|
Some work on Bin item rendering
|
2013-11-12 22:43:06 -05:00 |
|
Aidan C. Brady
|
8e08c9adb8
|
Once and for all fixed ConcurrentModificationException
|
2013-11-12 20:19:06 -05:00 |
|
Aidan C. Brady
|
3b64a043df
|
Bins can eject and accept items in block form, transporter support untested
|
2013-11-12 20:14:21 -05:00 |
|
Aidan C. Brady
|
1e336047d2
|
Bin block-based inventory work
|
2013-11-12 19:18:22 -05:00 |
|
Aidan C. Brady
|
e6ed263aa3
|
More bin work! :D
|
2013-11-12 18:42:55 -05:00 |
|
Aidan C. Brady
|
fe0631844b
|
Some work on Bins
|
2013-11-12 16:45:48 -05:00 |
|
Aidan C. Brady
|
42fe1f3d69
|
Bin inventory management works! I have no idea how I managed this...
|
2013-11-12 11:01:16 -05:00 |
|
Aidan Brady
|
2a4a1cd291
|
Some more work on Bin crafting management. Don’t know if this is gonna work guys…
|
2013-11-11 23:57:33 -05:00 |
|
Aidan Brady
|
8cec8af952
|
Perhaps fixed a few bugs
|
2013-11-11 23:19:51 -05:00 |
|
Aidan Brady
|
80097e4d1b
|
Some work on bins, currently crashing if you try to craft
|
2013-11-11 22:52:12 -05:00 |
|
Aidan Brady
|
1ac243f091
|
Work on bins! :)
|
2013-11-11 19:27:36 -05:00 |
|
Aidan Brady
|
f6704dc5ea
|
Added name for bins, fixed IC2 bug, hopefully fixed ConcurrentModificationException
|
2013-11-11 17:23:14 -05:00 |
|
Aidan C. Brady
|
9c53f1be66
|
Some work on bins, fix tank bug
|
2013-11-11 17:08:13 -05:00 |
|
Aidan C. Brady
|
4b5c8498a3
|
Merge branch 'master' of https://github.com/aidancbrady/Mekanism
|
2013-11-11 14:38:03 -05:00 |
|
Aidan C. Brady
|
3c0c5bef0d
|
Major Universal Cable improvements, started work on Bin
|
2013-11-11 14:37:56 -05:00 |
|
Aidan Brady
|
5ad16564a3
|
Merge branch 'master' of https://github.com/aidancbrady/Mekanism
|
2013-11-10 19:35:52 -05:00 |
|
Aidan Brady
|
e277ee36c0
|
Fix some pathfinder bugs
|
2013-11-10 19:35:45 -05:00 |
|
Aidan C. Brady
|
99f53a1322
|
Some fancy sounds and tooltips
|
2013-11-10 18:54:30 -05:00 |
|
Aidan Brady
|
cc57fad0c2
|
Once again rewrote pathfinder. Idle paths are still fairly CPU intensive
|
2013-11-10 12:27:58 -05:00 |
|
Aidan Brady
|
dfd2985357
|
Transporters first try to send the item back home before idling
|
2013-11-09 15:30:30 -05:00 |
|
Aidan Brady
|
5a08cb1b90
|
Fix a possible crash
|
2013-11-09 10:56:47 -05:00 |
|
Aidan C. Brady
|
9883c9535c
|
Rest index when mode switched
|
2013-11-08 11:15:52 -05:00 |
|
Aidan C. Brady
|
51ad429973
|
Coming along with round robin mode :)
|
2013-11-08 11:13:51 -05:00 |
|
Aidan C. Brady
|
7cc72e65b3
|
Merge branch 'master' of https://github.com/aidancbrady/Mekanism
|
2013-11-08 07:53:40 -05:00 |
|
Aidan C. Brady
|
8f33094e10
|
Start on RR algorithm
|
2013-11-08 07:53:32 -05:00 |
|
Aidan Brady
|
1aec33d8ec
|
Added configuration option to turn off strict input colors
|
2013-11-07 21:27:12 -05:00 |
|
Aidan Brady
|
7053f4a30a
|
Whoops!
|
2013-11-07 19:17:24 -05:00 |
|
Aidan Brady
|
9fdcb13faa
|
Gas Tank recipe shows up in NEI
|
2013-11-07 19:15:58 -05:00 |
|
Aidan Brady
|
c02c53475d
|
Merge branch 'master' of https://github.com/aidancbrady/Mekanism
|
2013-11-07 16:59:43 -05:00 |
|
Aidan Brady
|
1df2209f25
|
Use proper obfuscation
|
2013-11-07 16:59:37 -05:00 |
|