AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-15 10:21:45 -04:00
Code Issues Packages Projects Releases Wiki Activity
4,089 Commits 29 Branches 143 Tags
Commit Graph

4089 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
166e3a6b0f Where did that random then come from? o.O 2014-12-24 01:47:58 +01:00
Florian Nücke
bd23253ff7 Added missing line wrap and fixed labeling derp in flash.lua. 2014-12-23 18:56:06 +01:00
Soni L.
d6d8d0b08a Add decimals to file:read("*n") 2014-12-23 14:03:49 -02:00
Soni L.
ff2d0342e1 Add readNumber()/file:read("*n") 2014-12-23 11:41:41 -02:00
Florian Nücke
aed09125c3 Merge remote-tracking branch 'origin/master-MC1.7.10' into drones 2014-12-23 13:18:40 +01:00
Florian Nücke
766eb0ac6d Fixed debug.runCommand in pure single player mode, fixes #754. 2014-12-23 13:16:03 +01:00
Florian Nücke
b338902b66 Bump API version for added interfaces. 2014-12-23 07:32:33 +01:00
Florian Nücke
b110816704 Organized imports. 2014-12-23 07:31:52 +01:00
Florian Nücke
1e48570153 Merge remote-tracking branch 'origin/master-MC1.7.10' into drones 
Conflicts:
	src/main/resources/application.conf
	src/main/scala/li/cil/oc/Settings.scala
	src/main/scala/li/cil/oc/common/IMC.scala
	src/main/scala/li/cil/oc/integration/opencomputers/ModOpenComputers.scala
 2014-12-23 03:55:58 +01:00
Florian Nücke
f499f939a8 Added configuration option to access points' component to set whether they should act as repeaters or not, closes #718. 2014-12-23 03:46:26 +01:00
Florian Nücke
00b216552c Added assembler template filter system, closes #753. 
Allows registering new filters via IMC. Providing default filter using new setting `misc.assemblerBlacklist` which is a list of item id + optional damage descriptors of the format 'itemid@damage', e.g. 'OpenComputers:case3' or 'minecraft:stonebrick@1'.
 2014-12-22 23:48:46 +01:00
Florian Nücke
c978290f44 Added debug.insertItem to spawn item stacks into inventories in the world, closes #752. 2014-12-22 22:06:52 +01:00
Florian Nücke
115242a20d All the string interpolation \o/ 2014-12-22 21:10:44 +01:00
Florian Nücke
7aff4cec3c Fixes for differences in merged branches. 2014-12-22 20:53:13 +01:00
Florian Nücke
a8dbb15745 Merge remote-tracking branch 'origin/master-MC1.7.10' into drones 2014-12-22 17:03:34 +01:00
Florian Nücke
f5193e9a4e Dem interface changes. 2014-12-22 17:01:39 +01:00
Florian Nücke
f147481900 Better Waila support for servers. 2014-12-22 16:57:53 +01:00
Florian Nücke
7885a3f5b3 Started updating to new Waila API (1.56). So much cleaner \o/ 2014-12-22 15:06:09 +01:00
Florian Nücke
29d112ac33 Added check for out of memory errors when trying to play computer beeps. 2014-12-22 05:23:46 +01:00
Florian Nücke
39f666ea94 Fixed unconnected servers not receiving energy since side rework a few commits back. 
Also added missing check for periodic power updates (for wireless strength based power consumption) which should improve racks' tick times a bit.
 2014-12-22 04:27:25 +01:00
Florian Nücke
0ac4c8efba Little bit of cleanup. 2014-12-22 03:39:50 +01:00
Florian Nücke
856b5fd275 Disassembler configurable via IMC, finally! 
Using that for special disassembly stuff like things built in assembler.
 2014-12-21 18:11:32 +01:00
Florian Nücke
52aef61d13 Multiple tiers for microcontroller and drones. 
Storing energy in MCU and drones and restoring it properly when placing them.
 2014-12-21 14:38:29 +01:00
Florian Nücke
dcae20e38c Merge remote-tracking branch 'origin/master-MC1.7.10' into drones 2014-12-21 12:51:02 +01:00
Florian Nücke
64afd8d98e Require IC2 proper to be present instead of just the API, should fix #747. 2014-12-20 21:03:49 +01:00
Florian Nücke
3dd7075518 Don't even try to render the holograms on very low-end cards that don't support OpenGL 1.5 to avoid crashes. 2014-12-19 19:28:49 +01:00
Florian Nücke
c6d5584f93 Recompiled native lib on Win7, let's see if this helps on some systems... 2014-12-19 18:11:52 +01:00
Florian Nücke
4eceafaaa5 Adding git ref to version when building locally. 2014-12-19 18:11:25 +01:00
Florian Nücke
d5ade3f12b Added leash upgrade. 2014-12-19 16:53:07 +01:00
Florian Nücke
643c4b7c1b Got rid of a few uses of ForgeDirection.UNKNOWN. 2014-12-17 18:08:51 +01:00
Florian Nücke
b65141afec Cheaper position update when target is reached. 
Specific power settings for drones.
 2014-12-16 22:58:33 +01:00
Florian Nücke
5d0d662c56 Merge remote-tracking branch 'origin/master-MC1.7.10' into drones 2014-12-16 20:03:56 +01:00
Florian Nücke
e66c7dc742 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-12-16 18:42:54 +01:00
Florian Nücke
27e74e2b63 Added setting for EEPROM size. Closes #742. 2014-12-16 18:41:29 +01:00
Florian Nücke
ea6cc631ef Using NamedBlock interface for ordering environments when merging them for blocks, should close #745. 
Also reworked callback analysis in general, should behave better in general, now (e.g. mixing ManagedPeripheral with Environment should work, now).
May also have broken everything ever, so re-testing with stuff that uses those interfaces (`NamedBlock`, `ManagedPeripheral`) is required.
 2014-12-16 18:37:20 +01:00
Florian Nücke
b877fca955 Drones unpickable, too much overhead to sync component data. 2014-12-16 17:52:31 +01:00
Florian "Sangar" Nücke
3084e68ba7 Merge pull request #744 from magik6k/master 
Added OpenLoader EEPROM flasher
 2014-12-16 16:17:00 +01:00
Florian Nücke
a322981dea More extraction of logic into traits. 
*BREAKING CHANGE*: Reworked inventory and tank controllers a bit. Specifically, the methods taking `sides.back` to indicate the robots own inventory now only operate on the world, internal inventory is accessed via separate methods now (e.g. getStackInSlot(sides.back, ...) -> getStackInInternalSlot(...)).
 2014-12-16 16:13:05 +01:00
Łukasz Magiera
818bc1c3a9 Added OpenLoader EEPROM flasher 2014-12-16 14:27:18 +01:00
Florian Nücke
fe9d7edc16 Tanks now working in drones. 2014-12-16 04:03:32 +01:00
Florian Nücke
8db3eeb042 Fixed component blacklisting (NBT tag didn't work because IDs can change when changing saves). 
Properly throwing an error when trying to create a packet with invalid data types.
 2014-12-16 03:49:14 +01:00
Florian Nücke
2813ef7541 Made drones chargeable via chargers, made charger logic more generic and fixed robots dropping components after refactor a few commits back. 2014-12-16 01:57:35 +01:00
Florian Nücke
ebfa43df2b Improved interaction of drones with water and other external forces. 2014-12-16 00:42:32 +01:00
Florian Nücke
768269054e More use of BlockPosition. 2014-12-15 23:53:07 +01:00
Florian Nücke
67b7da78a2 Little bit of cleanup in InventoryUtils. 2014-12-15 23:21:41 +01:00
Florian Nücke
c5e79df8b5 Extracted tank logic from robot component and some minor bugfixing. 2014-12-15 21:38:54 +01:00
Florian Nücke
006935ba06 Reworked component blacklisting logic to use IMC now, allowing other mods to tell OC components not to work in their blocks (e.g. for custom assembler templates). 
Only revalidating templates when a slot changed now.
Inventory upgrades properly work in drones now.
Can set status text from drone scripts now.
 2014-12-15 15:50:22 +01:00
Florian Nücke
95e2feef65 Include block drones are in when looking for items to suck in, to make that less awkward. 2014-12-15 06:38:58 +01:00
Florian Nücke
fafa9e42ae Fixed drones failing at picking up items in the world. 2014-12-15 06:28:41 +01:00
Florian Nücke
db87633364 Fixed drone bounds, cleaned up and fixed inventory interop some. 2014-12-15 05:52:38 +01:00